From cbe4e921bc1992e967b725a1853bac97840e1739 Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Fri, 20 Aug 1999 20:44:03 +0000
Subject: [PATCH] more compiler warnings removed

---
 lib/dns/sec/dnssafe/prime.c                  |  2 +-
 lib/dns/sec/dnssafe/surrendr.c               |  1 +
 lib/dns/sec/openssl/bn_recp.c                |  1 +
 lib/dns/sec/openssl/include/openssl/crypto.h |  8 ++++----
 lib/dns/sec/openssl/mem.c                    | 14 +++++++-------
 lib/dns/sec/openssl/sha1dgst.c               |  2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/dns/sec/dnssafe/prime.c b/lib/dns/sec/dnssafe/prime.c
index 2b23e9f01f..f2832ea1ec 100644
--- a/lib/dns/sec/dnssafe/prime.c
+++ b/lib/dns/sec/dnssafe/prime.c
@@ -30,7 +30,7 @@ A_SURRENDER_CTX *surrenderContext;
     u2[MAX_RSA_MODULUS_WORDS], u3[MAX_RSA_MODULUS_WORDS],
     u4[MAX_RSA_MODULUS_WORDS];
   char sieve[1000];
-  int status;
+  int status = 0;
   unsigned int i, r, s, testResult;
   
   do {
diff --git a/lib/dns/sec/dnssafe/surrendr.c b/lib/dns/sec/dnssafe/surrendr.c
index f915b059bd..c9aa460e51 100644
--- a/lib/dns/sec/dnssafe/surrendr.c
+++ b/lib/dns/sec/dnssafe/surrendr.c
@@ -8,6 +8,7 @@
 
 #include "global.h"
 #include "algae.h"
+#include "surrendr.h"
 
 /* Returns 0, AE_CANCEL.
  */
diff --git a/lib/dns/sec/openssl/bn_recp.c b/lib/dns/sec/openssl/bn_recp.c
index c1b0e230ea..9419ce0216 100644
--- a/lib/dns/sec/openssl/bn_recp.c
+++ b/lib/dns/sec/openssl/bn_recp.c
@@ -93,6 +93,7 @@ void BN_RECP_CTX_free(BN_RECP_CTX *recp)
 
 int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx)
 	{
+	ctx = ctx; /* BEW - quiet the compiler */
 	BN_copy(&(recp->N),d);
 	BN_zero(&(recp->Nr));
 	recp->num_bits=BN_num_bits(d);
diff --git a/lib/dns/sec/openssl/include/openssl/crypto.h b/lib/dns/sec/openssl/include/openssl/crypto.h
index 283261cb6c..7418274b33 100644
--- a/lib/dns/sec/openssl/include/openssl/crypto.h
+++ b/lib/dns/sec/openssl/include/openssl/crypto.h
@@ -268,10 +268,10 @@ const char *CRYPTO_get_lock_name(int type);
 int CRYPTO_add_lock(int *pointer,int amount,int type, const char *file,
 		    int line);
 
-void CRYPTO_set_mem_functions(char *(*m)(),char *(*r)(), void (*free_func)());
-void CRYPTO_get_mem_functions(char *(**m)(),char *(**r)(), void (**f)());
-void CRYPTO_set_locked_mem_functions(char *(*m)(), void (*free_func)());
-void CRYPTO_get_locked_mem_functions(char *(**m)(), void (**f)());
+void CRYPTO_set_mem_functions(void *(*m)(),void *(*r)(), void (*free_func)());
+void CRYPTO_get_mem_functions(void *(**m)(),void *(**r)(), void (**f)());
+void CRYPTO_set_locked_mem_functions(void *(*m)(), void (*free_func)());
+void CRYPTO_get_locked_mem_functions(void *(**m)(), void (**f)());
 
 void *CRYPTO_malloc_locked(int num);
 void CRYPTO_free_locked(void *);
diff --git a/lib/dns/sec/openssl/mem.c b/lib/dns/sec/openssl/mem.c
index 2121b42022..2f47b8236e 100644
--- a/lib/dns/sec/openssl/mem.c
+++ b/lib/dns/sec/openssl/mem.c
@@ -123,13 +123,13 @@ static unsigned long mem_hash(MEM *a)
 	return(ret);
 	}
 
-static char *(*malloc_locked_func)()=(char *(*)())malloc;
+static void *(*malloc_locked_func)()=(void *(*)())malloc;
 static void (*free_locked_func)()=(void (*)())free;
-static char *(*malloc_func)()=	(char *(*)())malloc;
-static char *(*realloc_func)()=	(char *(*)())realloc;
+static void *(*malloc_func)()=	(void *(*)())malloc;
+static void *(*realloc_func)()=	(void *(*)())realloc;
 static void (*free_func)()=	(void (*)())free;
 
-void CRYPTO_set_mem_functions(char *(*m)(), char *(*r)(), void (*f)())
+void CRYPTO_set_mem_functions(void *(*m)(), void *(*r)(), void (*f)())
 	{
 	if ((m == NULL) || (r == NULL) || (f == NULL)) return;
 	malloc_func=m;
@@ -139,21 +139,21 @@ void CRYPTO_set_mem_functions(char *(*m)(), char *(*r)(), void (*f)())
 	free_locked_func=f;
 	}
 
-void CRYPTO_set_locked_mem_functions(char *(*m)(), void (*f)())
+void CRYPTO_set_locked_mem_functions(void *(*m)(), void (*f)())
 	{
 	if ((m == NULL) || (f == NULL)) return;
 	malloc_locked_func=m;
 	free_locked_func=f;
 	}
 
-void CRYPTO_get_mem_functions(char *(**m)(), char *(**r)(), void (**f)())
+void CRYPTO_get_mem_functions(void *(**m)(), void *(**r)(), void (**f)())
 	{
 	if (m != NULL) *m=malloc_func;
 	if (r != NULL) *r=realloc_func;
 	if (f != NULL) *f=free_func;
 	}
 
-void CRYPTO_get_locked_mem_functions(char *(**m)(), void (**f)())
+void CRYPTO_get_locked_mem_functions(void *(**m)(), void (**f)())
 	{
 	if (m != NULL) *m=malloc_locked_func;
 	if (f != NULL) *f=free_locked_func;
diff --git a/lib/dns/sec/openssl/sha1dgst.c b/lib/dns/sec/openssl/sha1dgst.c
index af8d9aed8a..66e885dd76 100644
--- a/lib/dns/sec/openssl/sha1dgst.c
+++ b/lib/dns/sec/openssl/sha1dgst.c
@@ -114,7 +114,7 @@ void SHA1_Init(SHA_CTX *c)
 	c->num=0;
 	}
 
-void SHA1_Update(SHA_CTX *c, const register unsigned char *data,
+void SHA1_Update(SHA_CTX *c, register const unsigned char *data,
 	     unsigned long len)
 	{
 	register SHA_LONG *p;