From c5db363e1b75f8452e4c888402a8ecb291b13838 Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@openssl.org>
Date: Fri, 16 Apr 1999 18:13:27 +0000
Subject: [PATCH] Fix some warnings. Contributed by Anonymous.

---
 Configure                | 1 +
 crypto/asn1/asn_pack.c   | 4 +++-
 crypto/evp/e_cbc_r2.c    | 2 +-
 crypto/pkcs12/p12_decr.c | 4 +++-
 crypto/x509v3/v3_skey.c  | 2 +-
 ssl/ssl_sess.c           | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Configure b/Configure
index 61101f3800..72753f943a 100755
--- a/Configure
+++ b/Configure
@@ -83,6 +83,7 @@ my %table=(
 "purify",	"purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",
 "debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",
 "debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -pipe:::::",
+"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "dist",		"cc:-O -DNOPROTO::::",
 
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
index e04d327e41..6e0dd95622 100644
--- a/crypto/asn1/asn_pack.c
+++ b/crypto/asn1/asn_pack.c
@@ -114,7 +114,9 @@ char *ASN1_unpack_string (oct, d2i)
 ASN1_STRING *oct;
 char *(*d2i)();
 {
-	unsigned char *p, *ret;
+	unsigned char *p;
+	char *ret;
+
 	p = oct->data;
 	if(!(ret = d2i(NULL, &p, oct->length)))
 		ASN1err(ASN1_F_ASN1_UNPACK_STRING,ASN1_R_DECODE_ERROR);
diff --git a/crypto/evp/e_cbc_r2.c b/crypto/evp/e_cbc_r2.c
index 9175e53550..b15310ab48 100644
--- a/crypto/evp/e_cbc_r2.c
+++ b/crypto/evp/e_cbc_r2.c
@@ -192,7 +192,7 @@ int i;
 		}
 	}
 
-int rc2_get_asn1_type_and_iv(c,type)
+static int rc2_get_asn1_type_and_iv(c,type)
 EVP_CIPHER_CTX *c;
 ASN1_TYPE *type;
 	{
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index d28e886057..5dee184c7b 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -122,8 +122,10 @@ int passlen;
 ASN1_OCTET_STRING *oct;
 int seq;
 {
-	unsigned char *out, *p, *ret;
+	unsigned char *out, *p;
+	char *ret;
 	int outlen;
+
 	if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length,
 				 &out, &outlen, 0)) {
 		PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR);
diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c
index e725d6630c..932cd8b26c 100644
--- a/crypto/x509v3/v3_skey.c
+++ b/crypto/x509v3/v3_skey.c
@@ -115,7 +115,7 @@ char *str;
 
 }
 
-ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str)
+static ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
 char *str;
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 66bd281d16..1eb40c0606 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -251,7 +251,7 @@ int len;
 
 	if (ret->cipher == NULL)
 		{
-		char buf[5],*p;
+		unsigned char buf[5],*p;
 		unsigned long l;
 
 		p=buf;
-- 
GitLab