diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-11-30 09:20:26 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-11-30 09:25:24 +0100 |
| commit | 65e3753addcf46aa8eb45c608a5a02b9043c9578 (patch) | |
| tree | 5cd6bae5a60856ce1bf74889efed7531de9733fa | |
| parent | 3ae7423780426d2f2c97d87af6e9bcd6ce3a2f69 (diff) | |
| download | gnutls-65e3753addcf46aa8eb45c608a5a02b9043c9578.tar.gz | |
privkey: set the key parameters algorithm prior to returning success
| -rw-r--r-- | lib/x509/privkey.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 39e06f3fdd..c55611f7db 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -141,8 +141,6 @@ _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t * raw_key, gnutls_pk_params_init(&pkey->params); - pkey->params.algo = GNUTLS_PK_RSA; - if ((result = asn1_create_element(_gnutls_get_gnutls_asn(), "GNUTLS.RSAPrivateKey", @@ -224,6 +222,7 @@ _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t * raw_key, pkey->params.params_nr++; pkey->params.params_nr = RSA_PRIVATE_PARAMS; + pkey->params.algo = GNUTLS_PK_RSA; tmp_size = sizeof(tmp); result = asn1_read_value(pkey_asn, "otherInfo", tmp, &tmp_size); @@ -273,7 +272,6 @@ _gnutls_privkey_decode_ecc_key(ASN1_TYPE* pkey_asn, const gnutls_datum_t * raw_k gnutls_pk_params_init(&pkey->params); - pkey->params.algo = GNUTLS_PK_EC; if ((ret = asn1_create_element(_gnutls_get_gnutls_asn(), "GNUTLS.ECPrivateKey", @@ -359,6 +357,7 @@ _gnutls_privkey_decode_ecc_key(ASN1_TYPE* pkey_asn, const gnutls_datum_t * raw_k goto error; } pkey->params.params_nr++; + pkey->params.algo = GNUTLS_PK_EC; return 0; @@ -390,7 +389,6 @@ decode_dsa_key(const gnutls_datum_t * raw_key, gnutls_x509_privkey_t pkey) gnutls_pk_params_init(&pkey->params); - pkey->params.algo = GNUTLS_PK_DSA; result = _asn1_strict_der_decode(&dsa_asn, raw_key->data, raw_key->size, @@ -439,6 +437,7 @@ decode_dsa_key(const gnutls_datum_t * raw_key, gnutls_x509_privkey_t pkey) goto error; } pkey->params.params_nr++; + pkey->params.algo = GNUTLS_PK_DSA; oid_size = sizeof(oid); result = asn1_read_value(dsa_asn, "seed.algorithm", oid, &oid_size); |