X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdsa%2Fdsa_key.c;h=5aef2d5fcffb6541a62f279c88d7ba1a2b43aab6;hb=7b224903f4d4e2c74d1548b6f0ca8b0ba31113ad;hp=d51ed9395f14a6e7f13226007666c5f21fb899e7;hpb=7dfb0b774e6592dcbfe47015168a0ac8b44e2a17;p=oweals%2Fopenssl.git

diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index d51ed9395f..5aef2d5fcf 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -56,16 +56,16 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_SHA
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
-#include "sha.h"
-#include "bn.h"
-#include "dsa.h"
-#include "rand.h"
+#include <openssl/sha.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rand.h>
 
-int DSA_generate_key(dsa)
-DSA *dsa;
+int DSA_generate_key(DSA *dsa)
 	{
 	int ok=0;
 	unsigned int i;
@@ -84,7 +84,8 @@ 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;
@@ -109,4 +110,4 @@ err:
 	if (ctx != NULL) BN_CTX_free(ctx);
 	return(ok);
 	}
-
+#endif