Deleted Added
sdiff udiff text old ( 302408 ) new ( 325337 )
full compact
pem_pkey.c (302408) pem_pkey.c (325337)
1/* crypto/pem/pem_pkey.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 106 unchanged lines hidden (view full) ---

115 klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u);
116 if (klen <= 0) {
117 PEMerr(PEM_F_PEM_READ_BIO_PRIVATEKEY, PEM_R_BAD_PASSWORD_READ);
118 X509_SIG_free(p8);
119 goto err;
120 }
121 p8inf = PKCS8_decrypt(p8, psbuf, klen);
122 X509_SIG_free(p8);
1/* crypto/pem/pem_pkey.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 106 unchanged lines hidden (view full) ---

115 klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u);
116 if (klen <= 0) {
117 PEMerr(PEM_F_PEM_READ_BIO_PRIVATEKEY, PEM_R_BAD_PASSWORD_READ);
118 X509_SIG_free(p8);
119 goto err;
120 }
121 p8inf = PKCS8_decrypt(p8, psbuf, klen);
122 X509_SIG_free(p8);
123 OPENSSL_cleanse(psbuf, klen);
123 if (!p8inf)
124 goto p8err;
125 ret = EVP_PKCS82PKEY(p8inf);
126 if (x) {
127 if (*x)
128 EVP_PKEY_free((EVP_PKEY *)*x);
129 *x = ret;
130 }

--- 163 unchanged lines hidden --- 		124 if (!p8inf)
125 goto p8err;
126 ret = EVP_PKCS82PKEY(p8inf);
127 if (x) {
128 if (*x)
129 EVP_PKEY_free((EVP_PKEY *)*x);
130 *x = ret;
131 }

--- 163 unchanged lines hidden ---