Fix warnings about mismatched prototypes, undefined size_t and value computed (c76fd290) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/apps.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2424,7 +2424,7 @@ static void jpake_send_step1(BIO bconn, JPAKE_CTX ctx)
	JPAKE_STEP1_generate(&s1, ctx);		JPAKE_STEP1_generate(&s1, ctx);
	jpake_send_part(bconn, &s1.p1);		jpake_send_part(bconn, &s1.p1);
	jpake_send_part(bconn, &s1.p2);		jpake_send_part(bconn, &s1.p2);
	BIO_flush(bconn);		(void)BIO_flush(bconn);
	JPAKE_STEP1_release(&s1);		JPAKE_STEP1_release(&s1);
	}		}

	@@ -2435,7 +2435,7 @@ static void jpake_send_step2(BIO bconn, JPAKE_CTX ctx)
	JPAKE_STEP2_init(&s2);		JPAKE_STEP2_init(&s2);
	JPAKE_STEP2_generate(&s2, ctx);		JPAKE_STEP2_generate(&s2, ctx);
	jpake_send_part(bconn, &s2);		jpake_send_part(bconn, &s2);
	BIO_flush(bconn);		(void)BIO_flush(bconn);
	JPAKE_STEP2_release(&s2);		JPAKE_STEP2_release(&s2);
	}		}

	@@ -2446,7 +2446,7 @@ static void jpake_send_step3a(BIO bconn, JPAKE_CTX ctx)
	JPAKE_STEP3A_init(&s3a);		JPAKE_STEP3A_init(&s3a);
	JPAKE_STEP3A_generate(&s3a, ctx);		JPAKE_STEP3A_generate(&s3a, ctx);
	BIO_write(bconn, s3a.hhk, sizeof s3a.hhk);		BIO_write(bconn, s3a.hhk, sizeof s3a.hhk);
	BIO_flush(bconn);		(void)BIO_flush(bconn);
	JPAKE_STEP3A_release(&s3a);		JPAKE_STEP3A_release(&s3a);
	}		}

	@@ -2457,7 +2457,7 @@ static void jpake_send_step3b(BIO bconn, JPAKE_CTX ctx)
	JPAKE_STEP3B_init(&s3b);		JPAKE_STEP3B_init(&s3b);
	JPAKE_STEP3B_generate(&s3b, ctx);		JPAKE_STEP3B_generate(&s3b, ctx);
	BIO_write(bconn, s3b.hk, sizeof s3b.hk);		BIO_write(bconn, s3b.hk, sizeof s3b.hk);
	BIO_flush(bconn);		(void)BIO_flush(bconn);
	JPAKE_STEP3B_release(&s3b);		JPAKE_STEP3B_release(&s3b);
	}		}

+1 −0

Original line number	Original line	Diff line number	Diff line
	#ifdef __SUNPRO_C		#ifdef __SUNPRO_C
	# include "../bn_asm.c" /* kind of dirty hack for Sun Studio */		# include "../bn_asm.c" /* kind of dirty hack for Sun Studio */
	#else		#else
			#include <sys/types.h>
	/*		/*
	* x86_64 BIGNUM accelerator version 0.1, December 2002.		* x86_64 BIGNUM accelerator version 0.1, December 2002.
	*		*

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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 *t);
	BN_ULONG bn_add_part_words(BN_ULONG r, const BN_ULONG a, const BN_ULONG *b,		BN_ULONG bn_add_part_words(BN_ULONG r, const BN_ULONG a, const BN_ULONG *b,
	size_t cl, ssize_t dl);		size_t cl, ssize_t dl);
	BN_ULONG bn_sub_part_words(BN_ULONG r, const BN_ULONG a, const BN_ULONG *b,		BN_ULONG bn_sub_part_words(BN_ULONG *r,
	int cl, int dl);		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,		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);		const BN_ULONG np,const BN_ULONG n0, int num);

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@
	#include <openssl/x509.h>		#include <openssl/x509.h>

	int EVP_VerifyFinal(EVP_MD_CTX ctx,const unsigned char sigbuf,		int EVP_VerifyFinal(EVP_MD_CTX ctx,const unsigned char sigbuf,
	unsigned int siglen, EVP_PKEY *pkey)		size_t siglen,EVP_PKEY *pkey)
	{		{
	unsigned char m[EVP_MAX_MD_SIZE];		unsigned char m[EVP_MAX_MD_SIZE];
	unsigned int m_len;		unsigned int m_len;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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,		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		/* 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		* we can "construct" a session to give us the desired check - ie. to