4 files changed, 8 insertions, 9 deletions
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index ca301c53363..68d9912cbc5 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -65,6 +65,10 @@
 #ifndef HEADER_DSA_H
 #define HEADER_DSA_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #ifdef NO_DSA
 #error DSA is disabled.
 #endif
@@ -77,10 +81,6 @@
 
 #define DSA_FLAG_CACHE_MONT_P	0x01
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 typedef struct dsa_st DSA;
 
 typedef struct DSA_SIG_st
diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index 2b3ab3a9ad8..38e4af968cb 100644
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -54,8 +54,7 @@
  */
 
 /* 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,
- * only reason strings will be preserved.
+ * made to it will be overwritten when the script next updates this file.
  */
 
 #include <stdio.h>
diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 5aef2d5fcff..ab7f38fc7c6 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -84,8 +84,7 @@ int DSA_generate_key(DSA *dsa)
 	i=BN_num_bits(dsa->q);
 	for (;;)
 		{
-		if (!BN_rand(priv_key,i,1,0))
-			goto err;
+		BN_rand(priv_key,i,1,0);
 		if (BN_cmp(priv_key,dsa->q) >= 0)
 			BN_sub(priv_key,priv_key,dsa->q);
 		if (!BN_is_zero(priv_key)) break;
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 9c106b2b165..224e412afc4 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -107,8 +107,9 @@ DSA *DSA_new_method(DSA_METHOD *meth)
 		DSAerr(DSA_F_DSA_NEW,ERR_R_MALLOC_FAILURE);
 		return(NULL);
 		}
+	if(!default_DSA_method) default_DSA_method = DSA_OpenSSL();
 	if(meth) ret->meth = meth;
-	else ret->meth = DSA_get_default_method();
+	else ret->meth = default_DSA_method;
 	ret->pad=0;
 	ret->version=0;
 	ret->write_params=1;