dlfcn: always define _GNU_SOURCE

[oweals/openssl.git] / crypto / cms / cms_sd.c

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index e8b2e1f889dcb5f2dc2f5e7cb37d9b7611e1e96a..681ee7e34803eff8a5bc7ca52e478d85852478c8 100644 (file)
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -159,8 +159,8 @@ static void cms_sd_set_version(CMS_SignedData *sd)
                        if (sd->version < 3)
                                sd->version = 3;
                        }
-               else
-                       sd->version = 1;
+               else if (si->version < 1)
+                       si->version = 1;
                }
 
        if (sd->version < 1)
@@ -680,7 +680,10 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
                        goto err;
                        }
                if (EVP_PKEY_sign(pctx, sig, &siglen, md, mdlen) <= 0)
+                       {
+                       OPENSSL_free(sig);
                        goto err;
+                       }
                ASN1_STRING_set0(si->signature, sig, siglen);
                }
        else