| pem_pk8.c (302408) | pem_pk8.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 * --- 164 unchanged lines hidden (view full) --- 173 klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); 174 if (klen <= 0) { 175 PEMerr(PEM_F_D2I_PKCS8PRIVATEKEY_BIO, PEM_R_BAD_PASSWORD_READ); 176 X509_SIG_free(p8); 177 return NULL; 178 } 179 p8inf = PKCS8_decrypt(p8, psbuf, klen); 180 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 * --- 164 unchanged lines hidden (view full) --- 173 klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); 174 if (klen <= 0) { 175 PEMerr(PEM_F_D2I_PKCS8PRIVATEKEY_BIO, PEM_R_BAD_PASSWORD_READ); 176 X509_SIG_free(p8); 177 return NULL; 178 } 179 p8inf = PKCS8_decrypt(p8, psbuf, klen); 180 X509_SIG_free(p8); |
| 181 OPENSSL_cleanse(psbuf, klen); |
|
| 181 if (!p8inf) 182 return NULL; 183 ret = EVP_PKCS82PKEY(p8inf); 184 PKCS8_PRIV_KEY_INFO_free(p8inf); 185 if (!ret) 186 return NULL; 187 if (x) { 188 if (*x) --- 71 unchanged lines hidden --- | 182 if (!p8inf) 183 return NULL; 184 ret = EVP_PKCS82PKEY(p8inf); 185 PKCS8_PRIV_KEY_INFO_free(p8inf); 186 if (!ret) 187 return NULL; 188 if (x) { 189 if (*x) --- 71 unchanged lines hidden --- |