OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c
index dc6ab41db8..d5d4884c82 100644
--- a/src/lib/libcrypto/pkcs12/p12_init.c
+++ b/src/lib/libcrypto/pkcs12/p12_init.c
@@ -69,11 +69,11 @@ PKCS12 *PKCS12_init (int mode)
                 PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
-        if (!(pkcs12->version = ASN1_INTEGER_new ())) {
+        if (!(pkcs12->version = M_ASN1_INTEGER_new ())) {
                 PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
-        ASN1_INTEGER_set (pkcs12->version, 3);
+        ASN1_INTEGER_set(pkcs12->version, 3);
         if (!(pkcs12->authsafes = PKCS7_new())) {
                 PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                 return NULL;
@@ -82,7 +82,7 @@ PKCS12 *PKCS12_init (int mode)
         switch (mode) {
                 case NID_pkcs7_data:
                         if (!(pkcs12->authsafes->d.data =
-                                 ASN1_OCTET_STRING_new())) {
+                                 M_ASN1_OCTET_STRING_new())) {
                         PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                         return NULL;
                 }