import DSA changes from 0.9.6a (Bleichenbacher attack), ok provos@/deraadt@

1 files changed, 5 insertions, 10 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
index af3c56d770..a68d236e05 100644
--- a/src/lib/libcrypto/dsa/dsa_key.c
+++ b/src/lib/libcrypto/dsa/dsa_key.c
@@ -65,10 +65,11 @@
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 
+extern int      __BN_rand_range(BIGNUM *r, BIGNUM *range);
+
 int DSA_generate_key(DSA *dsa)
         {
         int ok=0;
-        unsigned int i;
         BN_CTX *ctx=NULL;
         BIGNUM *pub_key=NULL,*priv_key=NULL;
 
@@ -81,15 +82,9 @@ int DSA_generate_key(DSA *dsa)
         else
                 priv_key=dsa->priv_key;
 
-        i=BN_num_bits(dsa->q);
-        for (;;)
-                {
-                if (!BN_rand(priv_key,i,0,0))
-                        goto err;
-                if (BN_cmp(priv_key,dsa->q) >= 0)
-                        BN_sub(priv_key,priv_key,dsa->q);
-                if (!BN_is_zero(priv_key)) break;
-                }
+        do
+                if (!__BN_rand_range(priv_key,dsa->q)) goto err;
+        while (BN_is_zero(priv_key));
 
         if (dsa->pub_key == NULL)
                 {