Commit ee121033 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make sure the given EVP_PKEY is updated in the PEM_STRING_PKCS8INF case also. 

PR: 833
parent 4090b56b

crypto/pem/pem_pkey.c

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo 
		p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);

		if(!p8inf) goto p8err;

		ret = EVP_PKCS82PKEY(p8inf);

		if(x) {

			if(*x) EVP_PKEY_free((EVP_PKEY *)*x);

			*x = ret;

		}

		PKCS8_PRIV_KEY_INFO_free(p8inf);

	} else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {

		PKCS8_PRIV_KEY_INFO *p8inf;