summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-05-03 11:38:43 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-05-03 11:59:32 -0700
commit95d9351415d3cf79d69ce05271235ef3ccafe318 (patch)
tree2fff4f1c892b644cf0c5d3ad268cabb93b947d0a /src
parentb935273fda1b04385ff80b7f261a886a04b9c917 (diff)
parent591be84e89682622957c8f103ca4be3a5ed0f800 (diff)
downloadexternal_boringssl-95d9351415d3cf79d69ce05271235ef3ccafe318.zip
external_boringssl-95d9351415d3cf79d69ce05271235ef3ccafe318.tar.gz
external_boringssl-95d9351415d3cf79d69ce05271235ef3ccafe318.tar.bz2
Merge tag 'android-6.0.1_r43' into HEAD
Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: I00236550a0fdbf7973138627eed31326c37010f0
Diffstat (limited to 'src')
-rw-r--r--src/crypto/evp/p_dsa_asn1.c60
1 files changed, 7 insertions, 53 deletions
diff --git a/src/crypto/evp/p_dsa_asn1.c b/src/crypto/evp/p_dsa_asn1.c
index 0ac7da7..2c3326e 100644
--- a/src/crypto/evp/p_dsa_asn1.c
+++ b/src/crypto/evp/p_dsa_asn1.c
@@ -168,64 +168,20 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) {
/* In PKCS#8 DSA: you just get a private key integer and parameters in the
* AlgorithmIdentifier the pubkey must be recalculated. */
- STACK_OF(ASN1_TYPE) *ndsa = NULL;
DSA *dsa = NULL;
if (!PKCS8_pkey_get0(NULL, &p, &pklen, &palg, p8)) {
return 0;
}
- X509_ALGOR_get0(NULL, &ptype, &pval, palg);
-
- /* Check for broken DSA PKCS#8, UGH! */
- if (*p == (V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED)) {
- ASN1_TYPE *t1, *t2;
- ndsa = d2i_ASN1_SEQUENCE_ANY(NULL, &p, pklen);
- if (ndsa == NULL) {
- goto decerr;
- }
- if (sk_ASN1_TYPE_num(ndsa) != 2) {
- goto decerr;
- }
-
- /* Handle Two broken types:
- * SEQUENCE {parameters, priv_key}
- * SEQUENCE {pub_key, priv_key}. */
-
- t1 = sk_ASN1_TYPE_value(ndsa, 0);
- t2 = sk_ASN1_TYPE_value(ndsa, 1);
- if (t1->type == V_ASN1_SEQUENCE) {
- p8->broken = PKCS8_EMBEDDED_PARAM;
- pval = t1->value.ptr;
- } else if (ptype == V_ASN1_SEQUENCE) {
- p8->broken = PKCS8_NS_DB;
- } else {
- goto decerr;
- }
-
- if (t2->type != V_ASN1_INTEGER) {
- goto decerr;
- }
-
- privkey = t2->value.integer;
- } else {
- const uint8_t *q = p;
- privkey = d2i_ASN1_INTEGER(NULL, &p, pklen);
- if (privkey == NULL) {
- goto decerr;
- }
- if (privkey->type == V_ASN1_NEG_INTEGER) {
- p8->broken = PKCS8_NEG_PRIVKEY;
- ASN1_INTEGER_free(privkey);
- privkey = d2i_ASN1_UINTEGER(NULL, &q, pklen);
- if (privkey == NULL) {
- goto decerr;
- }
- }
- if (ptype != V_ASN1_SEQUENCE) {
- goto decerr;
- }
+ privkey = d2i_ASN1_INTEGER(NULL, &p, pklen);
+ if (privkey == NULL || privkey->type == V_ASN1_NEG_INTEGER) {
+ goto decerr;
}
+ X509_ALGOR_get0(NULL, &ptype, &pval, palg);
+ if (ptype != V_ASN1_SEQUENCE) {
+ goto decerr;
+ }
pstr = pval;
pm = pstr->data;
pmlen = pstr->length;
@@ -258,7 +214,6 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) {
EVP_PKEY_assign_DSA(pkey, dsa);
BN_CTX_free(ctx);
- sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
ASN1_INTEGER_free(privkey);
return 1;
@@ -269,7 +224,6 @@ decerr:
dsaerr:
BN_CTX_free(ctx);
ASN1_INTEGER_free(privkey);
- sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
DSA_free(dsa);
return 0;
}