X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fpem%2Fpem_pkey.c;h=92a55f536aebbbf958178273ad73e43fe3e0c1a7;hp=270892d72bb668bc5f1477257c9bef330aff201f;hb=5488bb6197b9af7a4670fb88936f0b53a9af0d2f;hpb=1241126adf6c451d6a7115ffdc68fa64c4d55593

diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index 270892d72b..92a55f536a 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -82,9 +82,12 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo
 		ret=d2i_PrivateKey(EVP_PKEY_RSA,x,&p,len);
 	else if (strcmp(nm,PEM_STRING_DSA) == 0)
 		ret=d2i_PrivateKey(EVP_PKEY_DSA,x,&p,len);
+	else if (strcmp(nm,PEM_STRING_ECPRIVATEKEY) == 0)
+		ret=d2i_PrivateKey(EVP_PKEY_EC,x,&p,len);
 	else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) {
 		PKCS8_PRIV_KEY_INFO *p8inf;
 		p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);
+		if(!p8inf) goto p8err;
 		ret = EVP_PKCS82PKEY(p8inf);
 		PKCS8_PRIV_KEY_INFO_free(p8inf);
 	} else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {