[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8a05c4d3b5a1bfb9193ea24e71735e11de7168d2 (commit)
      from  062540cbc511e38e25062fcd63a8c815ad071912 (commit)


- Log -----------------------------------------------------------------
commit 8a05c4d3b5a1bfb9193ea24e71735e11de7168d2
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 18 16:19:26 2017 +0100

    Fix DSA parameter generation control error
    
    When setting the digest parameter for DSA parameter generation, the
    signature MD was set instead of the parameter generation one.
    Fortunately, that's also the one that was used for parameter
    generation, but it ultimately meant the parameter generator MD and the
    signature MD would always be the same.
    
    Fixes github issue #2016
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2250)

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

Summary of changes:
 crypto/dsa/dsa_pmeth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index 4180958..95f088a 100644
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -136,7 +136,7 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
             return 0;
         }
-        dctx->md = p2;
+        dctx->pmd = p2;
         return 1;
 
     case EVP_PKEY_CTRL_MD: