diff options
| author | Bodo Möller <bodo@openssl.org> | 2002-02-13 18:21:51 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2002-02-13 18:21:51 +0000 |
| commit | 4d94ae00d5614d64d4dd065860c4b00161a81f82 (patch) | |
| tree | e993aa323ea753b3c0782439eb78f4f8c896a67e /crypto/asn1/d2i_pr.c | |
| parent | 60d8bae30d1040a4f955e3247443b2dd4c674cde (diff) | |
| download | openssl-4d94ae00d5614d64d4dd065860c4b00161a81f82.tar.gz | |
ECDSA support
Submitted by: Nils Larsch <nla@trustcenter.de>
Diffstat (limited to 'crypto/asn1/d2i_pr.c')
| -rw-r--r-- | crypto/asn1/d2i_pr.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index 2e7d96af90..d56e5fdc6e 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -68,6 +68,9 @@ #ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> #endif +#ifndef OPENSSL_NO_ECDSA +#include <openssl/ecdsa.h> +#endif EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp, long length) @@ -108,6 +111,16 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp, } break; #endif +#ifndef OPENSSL_NO_ECDSA + case EVP_PKEY_ECDSA: + if ((ret->pkey.ecdsa = d2i_ECDSAPrivateKey(NULL, + (const unsigned char **)pp, length)) == NULL) + { + ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB); + goto err; + } + break; +#endif default: ASN1err(ASN1_F_D2I_PRIVATEKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE); goto err; @@ -138,7 +151,10 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, unsigned char **pp, /* Since we only need to discern "traditional format" RSA and DSA * keys we can just count the elements. */ - if(sk_ASN1_TYPE_num(inkey) == 6) keytype = EVP_PKEY_DSA; + if(sk_ASN1_TYPE_num(inkey) == 6) + keytype = EVP_PKEY_DSA; + else if (sk_ASN1_TYPE_num(inkey) == 4) + keytype = EVP_PKEY_ECDSA; else keytype = EVP_PKEY_RSA; sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free); return d2i_PrivateKey(keytype, a, pp, length); |