| pem_pkey.c (325337) | pem_pkey.c (337982) |
|---|---|
| 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 * --- 99 unchanged lines hidden (view full) --- 108 char psbuf[PEM_BUFSIZE]; 109 p8 = d2i_X509_SIG(NULL, &p, len); 110 if (!p8) 111 goto p8err; 112 if (cb) 113 klen = cb(psbuf, PEM_BUFSIZE, 0, u); 114 else 115 klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); | 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 * --- 99 unchanged lines hidden (view full) --- 108 char psbuf[PEM_BUFSIZE]; 109 p8 = d2i_X509_SIG(NULL, &p, len); 110 if (!p8) 111 goto p8err; 112 if (cb) 113 klen = cb(psbuf, PEM_BUFSIZE, 0, u); 114 else 115 klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); |
| 116 if (klen <= 0) { | 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); 124 if (!p8inf) --- 170 unchanged lines hidden --- | 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); 124 if (!p8inf) --- 170 unchanged lines hidden --- |