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

diff --git a/src/lib/libcrypto/dsa/dsa_asn1.c b/src/lib/libcrypto/dsa/dsa_asn1.c
index 7523b21654..c9b32b4db7 100644
--- a/src/lib/libcrypto/dsa/dsa_asn1.c
+++ b/src/lib/libcrypto/dsa/dsa_asn1.c
@@ -83,7 +83,7 @@ DSA_SIG *d2i_DSA_SIG(DSA_SIG **a, unsigned char **pp, long length)
         M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
         if ((ret->s=BN_bin2bn(bs->data,bs->length,ret->s)) == NULL)
                 goto err_bn;
-        ASN1_BIT_STRING_free(bs);
+        M_ASN1_BIT_STRING_free(bs);
         M_ASN1_D2I_Finish_2(a);
 
 err_bn:
@@ -91,6 +91,6 @@ err_bn:
 err:
         DSAerr(DSA_F_D2I_DSA_SIG,i);
         if ((ret != NULL) && ((a == NULL) || (*a != ret))) DSA_SIG_free(ret);
-        if (bs != NULL) ASN1_BIT_STRING_free(bs);
+        if (bs != NULL) M_ASN1_BIT_STRING_free(bs);
         return(NULL);
 }