[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  10a57adc606b86949007c076336e74970c2f336f (commit)
      from  b375f08145d78479674580042614c9e770b011dd (commit)


- Log -----------------------------------------------------------------
commit 10a57adc606b86949007c076336e74970c2f336f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Apr 28 16:47:36 2016 +0100

    Remove some dead code
    
    Commit e1d9f1ab39eea left some dead code behind. This removes it.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 crypto/dsa/dsa_ossl.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 9285553..2e4b3a7 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -140,7 +140,6 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
     BN_CTX *ctx = NULL;
     int reason = ERR_R_BN_LIB;
     DSA_SIG *ret = NULL;
-    int noredo = 0;
     int rv = 0;
 
     m = BN_new();
@@ -191,13 +190,8 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
      * Redo if r or s is zero as required by FIPS 186-3: this is very
      * unlikely.
      */
-    if (BN_is_zero(r) || BN_is_zero(s)) {
-        if (noredo) {
-            reason = DSA_R_NEED_NEW_SETUP_VALUES;
-            goto err;
-        }
+    if (BN_is_zero(r) || BN_is_zero(s))
         goto redo;
-    }
 
     rv = 1;