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

diff --git a/src/lib/libcrypto/asn1/p7_enc_c.c b/src/lib/libcrypto/asn1/p7_enc_c.c
index a832737a38..582cc78b06 100644
--- a/src/lib/libcrypto/asn1/p7_enc_c.c
+++ b/src/lib/libcrypto/asn1/p7_enc_c.c
@@ -101,7 +101,8 @@ PKCS7_ENC_CONTENT *PKCS7_ENC_CONTENT_new(void)
 
         M_ASN1_New_Malloc(ret,PKCS7_ENC_CONTENT);
         /* M_ASN1_New(ret->content_type,ASN1_OBJECT_new); */
-        ret->content_type=OBJ_nid2obj(NID_pkcs7_encrypted);
+        /* We will almost always want this: so make it the default */
+        ret->content_type=OBJ_nid2obj(NID_pkcs7_data);
         M_ASN1_New(ret->algorithm,X509_ALGOR_new);
         ret->enc_data=NULL;
         return(ret);
@@ -113,7 +114,7 @@ void PKCS7_ENC_CONTENT_free(PKCS7_ENC_CONTENT *a)
         if (a == NULL) return;
         ASN1_OBJECT_free(a->content_type);
         X509_ALGOR_free(a->algorithm);
-        ASN1_OCTET_STRING_free(a->enc_data);
-        Free((char *)a);
+        M_ASN1_OCTET_STRING_free(a->enc_data);
+        Free(a);
         }