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/asn1/p7_enc.c b/src/lib/libcrypto/asn1/p7_enc.c
index 4741126587..83b0e15faa 100644
--- a/src/lib/libcrypto/asn1/p7_enc.c
+++ b/src/lib/libcrypto/asn1/p7_enc.c
@@ -95,7 +95,7 @@ PKCS7_ENCRYPT *PKCS7_ENCRYPT_new(void)
         ASN1_CTX c;
 
         M_ASN1_New_Malloc(ret,PKCS7_ENCRYPT);
-        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->version,M_ASN1_INTEGER_new);
         M_ASN1_New(ret->enc_data,PKCS7_ENC_CONTENT_new);
         return(ret);
         M_ASN1_New_Error(ASN1_F_PKCS7_ENCRYPT_NEW);
@@ -104,8 +104,8 @@ PKCS7_ENCRYPT *PKCS7_ENCRYPT_new(void)
 void PKCS7_ENCRYPT_free(PKCS7_ENCRYPT *a)
         {
         if (a == NULL) return;
-        ASN1_INTEGER_free(a->version);
+        M_ASN1_INTEGER_free(a->version);
         PKCS7_ENC_CONTENT_free(a->enc_data);
-        Free((char *)a);
+        Free(a);
         }