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/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c
index 31c9782b77..f559351d18 100644
--- a/src/lib/libcrypto/pkcs12/p12_attr.c
+++ b/src/lib/libcrypto/pkcs12/p12_attr.c
@@ -73,11 +73,11 @@ int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name,
                 return 0;
         }
         keyid->type = V_ASN1_OCTET_STRING;
-        if (!(oct = ASN1_OCTET_STRING_new())) {
+        if (!(oct = M_ASN1_OCTET_STRING_new())) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
-        if (!ASN1_OCTET_STRING_set(oct, name, namelen)) {
+        if (!M_ASN1_OCTET_STRING_set(oct, name, namelen)) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
@@ -115,11 +115,11 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage)
                 return 0;
         }
         keyid->type = V_ASN1_BIT_STRING;
-        if (!(bstr = ASN1_BIT_STRING_new())) {
+        if (!(bstr = M_ASN1_BIT_STRING_new())) {
                 PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
-        if (!ASN1_BIT_STRING_set(bstr, &us_val, 1)) {
+        if (!M_ASN1_BIT_STRING_set(bstr, &us_val, 1)) {
                 PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
@@ -176,7 +176,7 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
                 return 0;
         }
         fname->type = V_ASN1_BMPSTRING;
-        if (!(bmp = ASN1_BMPSTRING_new())) {
+        if (!(bmp = M_ASN1_BMPSTRING_new())) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
                                                         ERR_R_MALLOC_FAILURE);
                 return 0;