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

Fix some warnings. Contributed by Anonymous.

parent ddb25f88

Configure

+1 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ my %table=( 
"purify",	"purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",

"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",	"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",	"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",

"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::::",

"dist",		"cc:-O -DNOPROTO::::",

crypto/asn1/asn_pack.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,9 @@ char *ASN1_unpack_string (oct, d2i) 
ASN1_STRING *oct;

ASN1_STRING *oct;

char *(*d2i)();

char *(*d2i)();

{

{

	unsigned char *p, *ret;

	unsigned char *p;

	char *ret;



	p = oct->data;

	p = oct->data;

	if(!(ret = d2i(NULL, &p, oct->length)))

	if(!(ret = d2i(NULL, &p, oct->length)))

		ASN1err(ASN1_F_ASN1_UNPACK_STRING,ASN1_R_DECODE_ERROR);

		ASN1err(ASN1_F_ASN1_UNPACK_STRING,ASN1_R_DECODE_ERROR);

crypto/evp/e_cbc_r2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

EVP_CIPHER_CTX *c;

ASN1_TYPE *type;

ASN1_TYPE *type;

	{

	{

crypto/pkcs12/p12_decr.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -122,8 +122,10 @@ int passlen; 
ASN1_OCTET_STRING *oct;

ASN1_OCTET_STRING *oct;

int seq;

int seq;

{

{

	unsigned char *out, *p, *ret;

	unsigned char *out, *p;

	char *ret;

	int outlen;

	int outlen;



	if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length,

	if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length,

				 &out, &outlen, 0)) {

				 &out, &outlen, 0)) {

		PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR);

		PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR);

crypto/x509v3/v3_skey.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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_EXT_METHOD *method;

X509V3_CTX *ctx;

X509V3_CTX *ctx;

char *str;

char *str;