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

diff --git a/src/lib/libcrypto/asn1/x_val.c b/src/lib/libcrypto/asn1/x_val.c
index 84d6f7ca4d..1a2f49ffdf 100644
--- a/src/lib/libcrypto/asn1/x_val.c
+++ b/src/lib/libcrypto/asn1/x_val.c
@@ -93,8 +93,8 @@ X509_VAL *X509_VAL_new(void)
         ASN1_CTX c;
 
         M_ASN1_New_Malloc(ret,X509_VAL);
-        M_ASN1_New(ret->notBefore,ASN1_TIME_new);
-        M_ASN1_New(ret->notAfter,ASN1_TIME_new);
+        M_ASN1_New(ret->notBefore,M_ASN1_TIME_new);
+        M_ASN1_New(ret->notAfter,M_ASN1_TIME_new);
         return(ret);
         M_ASN1_New_Error(ASN1_F_X509_VAL_NEW);
         }
@@ -102,8 +102,8 @@ X509_VAL *X509_VAL_new(void)
 void X509_VAL_free(X509_VAL *a)
         {
         if (a == NULL) return;
-        ASN1_TIME_free(a->notBefore);
-        ASN1_TIME_free(a->notAfter);
-        Free((char *)a);
+        M_ASN1_TIME_free(a->notBefore);
+        M_ASN1_TIME_free(a->notAfter);
+        Free(a);
         }