| pem_pkey.c (127128) | pem_pkey.c (142425) |
|---|---|
| 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 * --- 90 unchanged lines hidden (view full) --- 99 char psbuf[PEM_BUFSIZE]; 100 p8 = d2i_X509_SIG(NULL, &p, len); 101 if(!p8) goto p8err; 102 if (cb) klen=cb(psbuf,PEM_BUFSIZE,0,u); 103 else klen=PEM_def_callback(psbuf,PEM_BUFSIZE,0,u); 104 if (klen <= 0) { 105 PEMerr(PEM_F_PEM_ASN1_READ_BIO, 106 PEM_R_BAD_PASSWORD_READ); | 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 * --- 90 unchanged lines hidden (view full) --- 99 char psbuf[PEM_BUFSIZE]; 100 p8 = d2i_X509_SIG(NULL, &p, len); 101 if(!p8) goto p8err; 102 if (cb) klen=cb(psbuf,PEM_BUFSIZE,0,u); 103 else klen=PEM_def_callback(psbuf,PEM_BUFSIZE,0,u); 104 if (klen <= 0) { 105 PEMerr(PEM_F_PEM_ASN1_READ_BIO, 106 PEM_R_BAD_PASSWORD_READ); |
| 107 X509_SIG_free(p8); |
|
| 107 goto err; 108 } 109 p8inf = PKCS8_decrypt(p8, psbuf, klen); 110 X509_SIG_free(p8); 111 if(!p8inf) goto p8err; 112 ret = EVP_PKCS82PKEY(p8inf); 113 if(x) { 114 if(*x) EVP_PKEY_free((EVP_PKEY *)*x); --- 30 unchanged lines hidden --- | 108 goto err; 109 } 110 p8inf = PKCS8_decrypt(p8, psbuf, klen); 111 X509_SIG_free(p8); 112 if(!p8inf) goto p8err; 113 ret = EVP_PKCS82PKEY(p8inf); 114 if(x) { 115 if(*x) EVP_PKEY_free((EVP_PKEY *)*x); --- 30 unchanged lines hidden --- |