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

diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c
index 5a6f7b414f..add842d17a 100644
--- a/src/lib/libcrypto/x509/x509_set.c
+++ b/src/lib/libcrypto/x509/x509_set.c
@@ -68,7 +68,7 @@ int X509_set_version(X509 *x, long version)
         if (x == NULL) return(0);
         if (x->cert_info->version == NULL)
                 {
-                if ((x->cert_info->version=ASN1_INTEGER_new()) == NULL)
+                if ((x->cert_info->version=M_ASN1_INTEGER_new()) == NULL)
                         return(0);
                 }
         return(ASN1_INTEGER_set(x->cert_info->version,version));
@@ -82,10 +82,10 @@ int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
         in=x->cert_info->serialNumber;
         if (in != serial)
                 {
-                in=ASN1_INTEGER_dup(serial);
+                in=M_ASN1_INTEGER_dup(serial);
                 if (in != NULL)
                         {
-                        ASN1_INTEGER_free(x->cert_info->serialNumber);
+                        M_ASN1_INTEGER_free(x->cert_info->serialNumber);
                         x->cert_info->serialNumber=in;
                         }
                 }
@@ -112,10 +112,10 @@ int X509_set_notBefore(X509 *x, ASN1_UTCTIME *tm)
         in=x->cert_info->validity->notBefore;
         if (in != tm)
                 {
-                in=ASN1_UTCTIME_dup(tm);
+                in=M_ASN1_UTCTIME_dup(tm);
                 if (in != NULL)
                         {
-                        ASN1_UTCTIME_free(x->cert_info->validity->notBefore);
+                        M_ASN1_UTCTIME_free(x->cert_info->validity->notBefore);
                         x->cert_info->validity->notBefore=in;
                         }
                 }
@@ -130,10 +130,10 @@ int X509_set_notAfter(X509 *x, ASN1_UTCTIME *tm)
         in=x->cert_info->validity->notAfter;
         if (in != tm)
                 {
-                in=ASN1_UTCTIME_dup(tm);
+                in=M_ASN1_UTCTIME_dup(tm);
                 if (in != NULL)
                         {
-                        ASN1_UTCTIME_free(x->cert_info->validity->notAfter);
+                        M_ASN1_UTCTIME_free(x->cert_info->validity->notAfter);
                         x->cert_info->validity->notAfter=in;
                         }
                 }