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/x_sig.c b/src/lib/libcrypto/asn1/x_sig.c
index c2782d1b9c..3559bd5368 100644
--- a/src/lib/libcrypto/asn1/x_sig.c
+++ b/src/lib/libcrypto/asn1/x_sig.c
@@ -94,7 +94,7 @@ X509_SIG *X509_SIG_new(void)
 
         M_ASN1_New_Malloc(ret,X509_SIG);
         M_ASN1_New(ret->algor,X509_ALGOR_new);
-        M_ASN1_New(ret->digest,ASN1_OCTET_STRING_new);
+        M_ASN1_New(ret->digest,M_ASN1_OCTET_STRING_new);
         return(ret);
         M_ASN1_New_Error(ASN1_F_X509_SIG_NEW);
         }
@@ -103,8 +103,8 @@ void X509_SIG_free(X509_SIG *a)
         {
         if (a == NULL) return;
         X509_ALGOR_free(a->algor);
-        ASN1_OCTET_STRING_free(a->digest);
-        Free((char *)a);
+        M_ASN1_OCTET_STRING_free(a->digest);
+        Free(a);
         }