Merge in the main trunk, a few conflicts resolved.

diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 368c98765cbc89c901d7870bb665c776ece04fb6..1fbbd6c99f90dad4365c559692e7c3eec9c04734 100644 (file)
--- 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;
                }