summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiod <>2015-07-15 18:34:37 +0000
committermiod <>2015-07-15 18:34:37 +0000
commit989115f49773fbe56087cc2c93f928ab5cc6a8fb (patch)
treeebf65c6d7d30f000c4a8962fffffec3b66c62c59
parentdc1680faabf16760930a0aa503fcbf0adacb369c (diff)
downloadopenbsd-989115f49773fbe56087cc2c93f928ab5cc6a8fb.tar.gz
openbsd-989115f49773fbe56087cc2c93f928ab5cc6a8fb.tar.bz2
openbsd-989115f49773fbe56087cc2c93f928ab5cc6a8fb.zip
Fix inverted test in previous. Commit message told what we intended, but
we did not notice my fingers slipping. Noticed by bcook@
-rw-r--r--src/lib/libcrypto/dsa/dsa_gen.c4
-rw-r--r--src/lib/libssl/src/crypto/dsa/dsa_gen.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/dsa/dsa_gen.c b/src/lib/libcrypto/dsa/dsa_gen.c
index 342764397c..7ddb7fec5e 100644
--- a/src/lib/libcrypto/dsa/dsa_gen.c
+++ b/src/lib/libcrypto/dsa/dsa_gen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_gen.c,v 1.21 2015/07/15 16:32:29 miod Exp $ */ 1/* $OpenBSD: dsa_gen.c,v 1.22 2015/07/15 18:34:37 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -138,7 +138,7 @@ dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, const EVP_MD *evpmd,
138 seed_len = qsize; 138 seed_len = qsize;
139 if (seed_in != NULL) 139 if (seed_in != NULL)
140 memcpy(seed, seed_in, seed_len); 140 memcpy(seed, seed_in, seed_len);
141 else if (seed_len == 0) 141 else if (seed_len != 0)
142 goto err; 142 goto err;
143 143
144 if ((mont=BN_MONT_CTX_new()) == NULL) 144 if ((mont=BN_MONT_CTX_new()) == NULL)
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_gen.c b/src/lib/libssl/src/crypto/dsa/dsa_gen.c
index 342764397c..7ddb7fec5e 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_gen.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_gen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_gen.c,v 1.21 2015/07/15 16:32:29 miod Exp $ */ 1/* $OpenBSD: dsa_gen.c,v 1.22 2015/07/15 18:34:37 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -138,7 +138,7 @@ dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, const EVP_MD *evpmd,
138 seed_len = qsize; 138 seed_len = qsize;
139 if (seed_in != NULL) 139 if (seed_in != NULL)
140 memcpy(seed, seed_in, seed_len); 140 memcpy(seed, seed_in, seed_len);
141 else if (seed_len == 0) 141 else if (seed_len != 0)
142 goto err; 142 goto err;
143 143
144 if ((mont=BN_MONT_CTX_new()) == NULL) 144 if ((mont=BN_MONT_CTX_new()) == NULL)