[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Rich Salz]

The branch OpenSSL_1_0_1-stable has been updated
       via  72ac982306be9c9ad5f355dba725ab3d0716879e (commit)
      from  b0c8e38e3398a634b9be081fa377933ed8f45905 (commit)


- Log -----------------------------------------------------------------
commit 72ac982306be9c9ad5f355dba725ab3d0716879e
Author: Ismo Puustinen <ismo.puustinen at intel.com>
Date:   Fri Sep 18 16:07:23 2015 -0400

    GH367: use random data if seed too short.
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    (cherry picked from commit 6f997dc36504d67d1339ceb6bce4ecba673d8568)

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

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

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index d686ab0..defa499 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -201,7 +201,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
             if (!BN_GENCB_call(cb, 0, m++))
                 goto err;
 
-            if (!seed_len) {
+            if (!seed_len || !seed_in) {
                 if (RAND_pseudo_bytes(seed, qsize) < 0)
                     goto err;
                 seed_is_random = 1;
diff --git a/doc/crypto/DSA_generate_parameters.pod b/doc/crypto/DSA_generate_parameters.pod
index be7c924..f24c9c7 100644
--- a/doc/crypto/DSA_generate_parameters.pod
+++ b/doc/crypto/DSA_generate_parameters.pod
@@ -23,7 +23,7 @@ maximum of 1024 bits.
 If B<seed> is B<NULL> or B<seed_len> E<lt> 20, the primes will be
 generated at random. Otherwise, the seed is used to generate
 them. If the given seed does not yield a prime q, a new random
-seed is chosen and placed at B<seed>.
+seed is chosen.
 
 DSA_generate_parameters() places the iteration count in
 *B<counter_ret> and a counter used for finding a generator in