Commit ddb0cb5b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Avoid warnings. Fix fips_dssvs program.

parent b2d65cba

Configure

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ my %table=( 
"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",

"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",

"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -m32 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",

"debug-steve-linux-pseudo64",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT:${no_asm}:dlfcn:linux-shared",

"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

apps/ocsp.c

+1 −1
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp) 
		return 0;

	BIO_printf(cbio, http_resp, i2d_OCSP_RESPONSE(resp, NULL));

	i2d_OCSP_RESPONSE_bio(cbio, resp);

	BIO_flush(cbio);

	(void)BIO_flush(cbio);

	return 1;

	}

apps/rand.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ int MAIN(int argc, char **argv) 
		BIO_write(out, buf, chunk);

		num -= chunk;

		}

	BIO_flush(out);

	(void)BIO_flush(out);



	app_RAND_write_file(NULL, bio_err);

	ret = 0;

apps/s_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -573,5 +573,5 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void * 
			BIO_printf(bio, " ...");

		BIO_printf(bio, "\n");

		}

	BIO_flush(bio);

	(void)BIO_flush(bio);

	}

apps/s_client.c

+7 −7
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ re_start: 
			goto end;

			}



		BIO_ctrl_set_connected(sbio, 1, &peer);

		(void)BIO_ctrl_set_connected(sbio, 1, &peer);



		if ( enable_timeouts)

			{
@@ -752,7 +752,7 @@ re_start: 
		while (mbuf_len>3 && mbuf[3]=='-');

		/* STARTTLS command requires EHLO... */

		BIO_printf(fbio,"EHLO openssl.client.net\r\n");

		BIO_flush(fbio);

		(void)BIO_flush(fbio);

		/* wait for multi-line response to end EHLO SMTP response */

		do

			{
@@ -761,7 +761,7 @@ re_start: 
				foundit=1;

			}

		while (mbuf_len>3 && mbuf[3]=='-');

		BIO_flush(fbio);

		(void)BIO_flush(fbio);

		BIO_pop(fbio);

		BIO_free(fbio);

		if (!foundit)
@@ -785,7 +785,7 @@ re_start: 
		BIO_gets(fbio,mbuf,BUFSIZZ);

		/* STARTTLS command requires CAPABILITY... */

		BIO_printf(fbio,". CAPABILITY\r\n");

		BIO_flush(fbio);

		(void)BIO_flush(fbio);

		/* wait for multi-line CAPABILITY response */

		do

			{
@@ -794,7 +794,7 @@ re_start: 
				foundit=1;

			}

		while (mbuf_len>3 && mbuf[0]!='.');

		BIO_flush(fbio);

		(void)BIO_flush(fbio);

		BIO_pop(fbio);

		BIO_free(fbio);

		if (!foundit)
@@ -814,7 +814,7 @@ re_start: 
			mbuf_len = BIO_gets(fbio,mbuf,BUFSIZZ);

			}

		while (mbuf_len>3 && mbuf[3]=='-');

		BIO_flush(fbio);

		(void)BIO_flush(fbio);

		BIO_pop(fbio);

		BIO_free(fbio);

		BIO_printf(sbio,"AUTH TLS\r\n");
@@ -1303,6 +1303,6 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
	if (peer != NULL)

		X509_free(peer);

	/* flush, or debugging output gets mixed with http response */

	BIO_flush(bio);

	(void)BIO_flush(bio);

	}