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, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/asn1/p7_recip.c b/src/lib/libcrypto/asn1/p7_recip.c
index 9fda4f20d4..b1abfa3b8f 100644
--- a/src/lib/libcrypto/asn1/p7_recip.c
+++ b/src/lib/libcrypto/asn1/p7_recip.c
@@ -101,10 +101,10 @@ PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new(void)
         ASN1_CTX c;
 
         M_ASN1_New_Malloc(ret,PKCS7_RECIP_INFO);
-        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->version,M_ASN1_INTEGER_new);
         M_ASN1_New(ret->issuer_and_serial,PKCS7_ISSUER_AND_SERIAL_new);
         M_ASN1_New(ret->key_enc_algor,X509_ALGOR_new);
-        M_ASN1_New(ret->enc_key,ASN1_OCTET_STRING_new);
+        M_ASN1_New(ret->enc_key,M_ASN1_OCTET_STRING_new);
         ret->cert=NULL;
         return(ret);
         M_ASN1_New_Error(ASN1_F_PKCS7_RECIP_INFO_NEW);
@@ -113,10 +113,10 @@ PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new(void)
 void PKCS7_RECIP_INFO_free(PKCS7_RECIP_INFO *a)
         {
         if (a == NULL) return;
-        ASN1_INTEGER_free(a->version);
+        M_ASN1_INTEGER_free(a->version);
         PKCS7_ISSUER_AND_SERIAL_free(a->issuer_and_serial);
         X509_ALGOR_free(a->key_enc_algor);
-        ASN1_OCTET_STRING_free(a->enc_key);
+        M_ASN1_OCTET_STRING_free(a->enc_key);
         if (a->cert != NULL) X509_free(a->cert);
         Free(a);
         }