From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 2 Nov 2008 12:50:48 +0000 (+0000)
Subject: Fix warnings about mismatched prototypes, undefined size_t and value computed
X-Git-Tag: OpenSSL_0_9_8k^2~189
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c76fd290be9e4a755dde3c5fe1ed886a89e30fc6;p=oweals%2Fopenssl.git

Fix warnings about mismatched prototypes, undefined size_t and value computed
not used.
---

diff --git a/apps/apps.c b/apps/apps.c
index f011f0ba6a..7038ac1e24 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2424,7 +2424,7 @@ static void jpake_send_step1(BIO *bconn, JPAKE_CTX *ctx)
 	JPAKE_STEP1_generate(&s1, ctx);
 	jpake_send_part(bconn, &s1.p1);
 	jpake_send_part(bconn, &s1.p2);
-	BIO_flush(bconn);
+	(void)BIO_flush(bconn);
 	JPAKE_STEP1_release(&s1);
 	}
 
@@ -2435,7 +2435,7 @@ static void jpake_send_step2(BIO *bconn, JPAKE_CTX *ctx)
 	JPAKE_STEP2_init(&s2);
 	JPAKE_STEP2_generate(&s2, ctx);
 	jpake_send_part(bconn, &s2);
-	BIO_flush(bconn);
+	(void)BIO_flush(bconn);
 	JPAKE_STEP2_release(&s2);
 	}
 
@@ -2446,7 +2446,7 @@ static void jpake_send_step3a(BIO *bconn, JPAKE_CTX *ctx)
 	JPAKE_STEP3A_init(&s3a);
 	JPAKE_STEP3A_generate(&s3a, ctx);
 	BIO_write(bconn, s3a.hhk, sizeof s3a.hhk);
-	BIO_flush(bconn);
+	(void)BIO_flush(bconn);
 	JPAKE_STEP3A_release(&s3a);
 	}
 
@@ -2457,7 +2457,7 @@ static void jpake_send_step3b(BIO *bconn, JPAKE_CTX *ctx)
 	JPAKE_STEP3B_init(&s3b);
 	JPAKE_STEP3B_generate(&s3b, ctx);
 	BIO_write(bconn, s3b.hk, sizeof s3b.hk);
-	BIO_flush(bconn);
+	(void)BIO_flush(bconn);
 	JPAKE_STEP3B_release(&s3b);
 	}
 
diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
index 1509864574..85191ecb08 100644
--- a/crypto/bn/asm/x86_64-gcc.c
+++ b/crypto/bn/asm/x86_64-gcc.c
@@ -1,6 +1,7 @@
 #ifdef __SUNPRO_C
 # include "../bn_asm.c"	/* kind of dirty hack for Sun Studio */
 #else
+#include <sys/types.h>
 /*
  * x86_64 BIGNUM accelerator version 0.1, December 2002.
  *
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 857616d53b..05e8874a5a 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -481,8 +481,9 @@ void bn_mul_high(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, BN_ULONG *l, int n2,
 		 BN_ULONG *t);
 BN_ULONG bn_add_part_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
 			   size_t cl, ssize_t dl);
-BN_ULONG bn_sub_part_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
-			   int cl, int dl);
+BN_ULONG bn_sub_part_words(BN_ULONG *r,
+			   const BN_ULONG *a, const BN_ULONG *b,
+			   size_t cl, ssize_t dl);
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
 		const BN_ULONG *np,const BN_ULONG *n0, int num);
 
diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index 8db46412f3..16a449aed1 100644
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -62,8 +62,8 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-	     unsigned int siglen, EVP_PKEY *pkey)
+int	EVP_VerifyFinal(EVP_MD_CTX *ctx,const unsigned char *sigbuf,
+			size_t siglen,EVP_PKEY *pkey)
 	{
 	unsigned char m[EVP_MAX_MD_SIZE];
 	unsigned int m_len;
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 803894c44f..2e85a560fe 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -432,7 +432,7 @@ int SSL_set_generate_session_id(SSL *ssl, GEN_SESSION_CB cb)
 	}
 
 int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
-				unsigned int id_len)
+				    size_t id_len)
 	{
 	/* A quick examination of SSL_SESSION_hash and SSL_SESSION_cmp shows how
 	 * we can "construct" a session to give us the desired check - ie. to