diff options
author | jkim <jkim@FreeBSD.org> | 2016-01-28 21:42:10 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2016-01-28 21:42:10 +0000 |
commit | a81734f931d7dd55bdaf0d6d2b54458f8836fde6 (patch) | |
tree | 3723d09f10c41b94111f865e08e18ed679e8755d /crypto/openssl/crypto/dsa | |
parent | 07d36c1f7c56a074d717e2d90c58cc69397847df (diff) | |
download | FreeBSD-src-a81734f931d7dd55bdaf0d6d2b54458f8836fde6.zip FreeBSD-src-a81734f931d7dd55bdaf0d6d2b54458f8836fde6.tar.gz |
Merge OpenSSL 1.0.1r.
Relnotes: yes
Diffstat (limited to 'crypto/openssl/crypto/dsa')
-rw-r--r-- | crypto/openssl/crypto/dsa/dsa_ossl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssl/crypto/dsa/dsa_ossl.c b/crypto/openssl/crypto/dsa/dsa_ossl.c index 6edb26d..9a3772e 100644 --- a/crypto/openssl/crypto/dsa/dsa_ossl.c +++ b/crypto/openssl/crypto/dsa/dsa_ossl.c @@ -187,9 +187,6 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) if (!BN_mod_mul(s, s, kinv, dsa->q, ctx)) goto err; - ret = DSA_SIG_new(); - if (ret == NULL) - goto err; /* * Redo if r or s is zero as required by FIPS 186-3: this is very * unlikely. @@ -201,11 +198,14 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) } goto redo; } + ret = DSA_SIG_new(); + if (ret == NULL) + goto err; ret->r = r; ret->s = s; err: - if (!ret) { + if (ret == NULL) { DSAerr(DSA_F_DSA_DO_SIGN, reason); BN_free(r); BN_free(s); |