[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  36ac7bc8a9c856bcdff6eecdaca128ccc5430a1e (commit)
      from  a9009e518ca03f35a1e1a0858faf81865f8eff1e (commit)


- Log -----------------------------------------------------------------
commit 36ac7bc8a9c856bcdff6eecdaca128ccc5430a1e
Author: Ben Kaduk <bkaduk at akamai.com>
Date:   Fri Aug 28 12:41:50 2015 -0400

    GH367 follow-up, for more clarity
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

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

Summary of changes:
 crypto/dsa/dsa_gen.c                   | 8 ++++----
 doc/crypto/DSA_generate_parameters.pod | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index a4fae17..97110ef 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -136,7 +136,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
         if (seed_len < (size_t)qsize)
             return 0;
         if (seed_len > (size_t)qsize) {
-            /* Don't overflow seed local variable. */
+            /* Only consume as much seed as is expected. */
             seed_len = qsize;
         }
         memcpy(seed, seed_in, seed_len);
@@ -163,13 +163,13 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
 
     for (;;) {
         for (;;) {              /* find q */
-            int seed_is_random = seed_in == NULL;
+            int use_random_seed = (seed_in == NULL);
 
             /* step 1 */
             if (!BN_GENCB_call(cb, 0, m++))
                 goto err;
 
-            if (seed_is_random) {
+            if (use_random_seed) {
                 if (RAND_bytes(seed, qsize) <= 0)
                     goto err;
             } else {
@@ -201,7 +201,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
 
             /* step 4 */
             r = BN_is_prime_fasttest_ex(q, DSS_prime_checks, ctx,
-                                        seed_is_random, cb);
+                                        use_random_seed, cb);
             if (r > 0)
                 break;
             if (r != 0)
diff --git a/doc/crypto/DSA_generate_parameters.pod b/doc/crypto/DSA_generate_parameters.pod
index 92c89a0..ae13023 100644
--- a/doc/crypto/DSA_generate_parameters.pod
+++ b/doc/crypto/DSA_generate_parameters.pod
@@ -25,7 +25,7 @@ for use in the DSA and stores the result in B<dsa>.
 
 B<bits> is the length of the prime p to be generated.
 For lengths under 2048 bits, the length of q is 160 bits; for lengths
-at least 2048, it is set to 256 bits.
+greater than or equal to 2048 bits, the length of q is set to 256 bits.
 
 If B<seed> is NULL, the primes will be generated at random.
 If B<seed_len> is less than the length of q, an error is returned.