OpenSSL 0.9.5a merge

2 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_err.c b/src/lib/libcrypto/dsa/dsa_err.c
index 38e4af968c..2b3ab3a9ad 100644
--- a/src/lib/libcrypto/dsa/dsa_err.c
+++ b/src/lib/libcrypto/dsa/dsa_err.c
@@ -54,7 +54,8 @@
  */
 
 /* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
  */
 
 #include <stdio.h>
diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
index ab7f38fc7c..5aef2d5fcf 100644
--- a/src/lib/libcrypto/dsa/dsa_key.c
+++ b/src/lib/libcrypto/dsa/dsa_key.c
@@ -84,7 +84,8 @@ int DSA_generate_key(DSA *dsa)
         i=BN_num_bits(dsa->q);
         for (;;)
                 {
-                BN_rand(priv_key,i,1,0);
+                if (!BN_rand(priv_key,i,1,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;