Commit b3f34078 authored by Ben Laurie's avatar Ben Laurie
Browse files

Use new common flags and fix resulting warnings.

parent 477fd459

Configure

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ my %table=( 
"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::bn86-elf.o co86-elf.o",

"debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",

"debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",

"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::::",

"debug-ben-debug",	"gcc:$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -g3 -O2 -pipe::(unknown)::::::",

"debug-ben-no-opt",	"gcc: -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3::(unknown)::::::",

"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

crypto/evp/evp.h

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth, 


void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,

	int (*encrypt_init)(EVP_PKEY_CTX *ctx),

	int (*encrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,

	int (*encryptfn)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,

					const unsigned char *in, size_t inlen));



void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,

crypto/evp/pmeth_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -492,11 +492,11 @@ void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth, 


void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,

	int (*encrypt_init)(EVP_PKEY_CTX *ctx),

	int (*encrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,

	int (*encryptfn)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,

					const unsigned char *in, size_t inlen))

	{

	pmeth->encrypt_init = encrypt_init;

	pmeth->encrypt = encrypt;

	pmeth->encrypt = encryptfn;

	}



void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,

crypto/rand/rand_unix.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ int RAND_poll(void) 
				t.tv_sec = 0;

				t.tv_usec = usec;



				if (FD_SETSIZE > 0 && fd >= FD_SETSIZE)

				if (FD_SETSIZE > 0 && (unsigned)fd >= FD_SETSIZE)

					{

					/* can't use select, so just try to read once anyway */

					try_read = 1;

ssl/s2_pkt.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int write_pending(SSL *s, const unsigned char *buf, unsigned int len) 


static int n_do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len)

	{

	unsigned int j,k,olen,p,size,bs;

	unsigned int j,k,olen,p,bs;

	int mac_size;

	register unsigned char *pp;