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

diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c
index bb4697ae60..db051033d9 100644
--- a/src/lib/libcrypto/x509/x509_r2x.c
+++ b/src/lib/libcrypto/x509/x509_r2x.c
@@ -82,7 +82,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
 
         if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0)
                 {
-                if ((xi->version=ASN1_INTEGER_new()) == NULL) goto err;
+                if ((xi->version=M_ASN1_INTEGER_new()) == NULL) goto err;
                 if (!ASN1_INTEGER_set(xi->version,2)) goto err;
 /*              xi->extensions=ri->attributes; <- bad, should not ever be done
                 ri->attributes=NULL; */