[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  fa4629b6a2518d202fd051f228c3d8770682b3be (commit)
      from  5bb17d1b3cb1a02d1e48ad0810105f1b501b0532 (commit)


- Log -----------------------------------------------------------------
commit fa4629b6a2518d202fd051f228c3d8770682b3be
Author: Martin Vejnar <Martin.Vejnar at avg.com>
Date:   Wed Jul 29 17:28:19 2015 -0400

    RT3774: double-free in DSA
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/dsa/dsa_ameth.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 73dd158..0002e08 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -321,6 +321,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
     ASN1_STRING_clear_free(prkey);
+    prkey = NULL;
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
                          V_ASN1_SEQUENCE, params, dp, dplen))