From: Richard Levitte <levitte@openssl.org>
Date: Sun, 17 Sep 2000 20:34:31 +0000 (+0000)
Subject: Merge in the main trunk, a few conflicts resolved.
X-Git-Tag: OpenSSL-engine-0_9_6-beta2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42cc16030197d74058b1350052f0c3df0db0b8ce;p=oweals%2Fopenssl.git

Merge in the main trunk, a few conflicts resolved.
---

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;
 		}