diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-09-17 20:34:31 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-09-17 20:34:31 +0000 |
| commit | 42cc16030197d74058b1350052f0c3df0db0b8ce (patch) | |
| tree | 0bcb25212174f751143af7701e34077180c048b0 | |
| parent | 0e61cfff539e4c5ffed31932bf4c17109cc99a17 (diff) | |
Merge in the main trunk, a few conflicts resolved.
| -rw-r--r-- | crypto/pkcs12/p12_kiss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index 368c98765c..1fbbd6c99f 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -93,7 +93,7 @@ int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, /* Allocate stack for ca certificates if needed */ if ((ca != NULL) && (*ca == NULL)) { - if (!(*ca = sk_X509_new(NULL))) { + if (!(*ca = sk_X509_new_null())) { PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE); return 0; } |