Commit d8ec0dcf authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

Avoid some shadowed variable names. 

Submitted by: Nils Larsch
parent c465e794

apps/s_client.c

+3 −3
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
	SSL_CIPHER *c;

	X509_NAME *xn;

	int j,i;

	const COMP_METHOD *comp, *exp;

	const COMP_METHOD *comp, *expansion;



	if (full)

		{
@@ -1048,11 +1048,11 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
		EVP_PKEY_free(pktmp);

	}

	comp=SSL_get_current_compression(s);

	exp=SSL_get_current_expansion(s);

	expansion=SSL_get_current_expansion(s);

	BIO_printf(bio,"Compression: %s\n",

		comp ? SSL_COMP_get_name(comp) : "NONE");

	BIO_printf(bio,"Expansion: %s\n",

		exp ? SSL_COMP_get_name(exp) : "NONE");

		expansion ? SSL_COMP_get_name(expansion) : "NONE");

	SSL_SESSION_print(bio,SSL_get_session(s));

	BIO_printf(bio,"---\n");

	if (peer != NULL)

crypto/bio/b_dump.c

+5 −5
Original line number Diff line number Diff line
@@ -77,15 +77,15 @@ int BIO_dump_indent(BIO *bio, const char *s, int len, int indent) 
	{

	int ret=0;

	char buf[288+1],tmp[20],str[128+1];

	int i,j,rows,trunc;

	int i,j,rows,trc;

	unsigned char ch;

	int dump_width;

	

	trunc=0;

	trc=0;

	

#ifdef TRUNCATE

	for(; (len > 0) && ((s[len-1] == ' ') || (s[len-1] == '\0')); len--) 

		trunc++;

		trc++;

#endif



	if (indent < 0)
@@ -142,9 +142,9 @@ int BIO_dump_indent(BIO *bio, const char *s, int len, int indent) 
		ret+=BIO_write(bio,(char *)buf,strlen(buf));

		}

#ifdef TRUNCATE

	if (trunc > 0)

	if (trc > 0)

		{

		sprintf(buf,"%s%04x - <SPACES/NULS>\n",str,len+trunc);

		sprintf(buf,"%s%04x - <SPACES/NULS>\n",str,len+trc);

		ret+=BIO_write(bio,(char *)buf,strlen(buf));

		}

#endif

crypto/bio/b_print.c

+3 −3
Original line number Diff line number Diff line
@@ -576,12 +576,12 @@ abs_val(LDOUBLE value) 
}



static LDOUBLE

pow10(int exp)

pow10(int in_exp)

{

    LDOUBLE result = 1;

    while (exp) {

    while (in_exp) {

        result *= 10;

        exp--;

        in_exp--;

    }

    return result;

}

engines/vendor_defns/sureware.h

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ extern SW_EXPORT SureWareHook_Dsa_Sign_t SureWareHook_Dsa_Sign; 
*	mlen,elen and dlen are all multiple of sizeof(unsigned long)

*/

typedef int SureWareHook_Mod_Exp_t(char*const msg,int mlen,const unsigned long *mod,

									int elen,const unsigned long *exp,

									int elen,const unsigned long *exponent,

									int dlen,unsigned long *data,

									unsigned long *res);

extern SW_EXPORT SureWareHook_Mod_Exp_t SureWareHook_Mod_Exp;

ssl/s3_enc.c

+5 −5
Original line number Diff line number Diff line
@@ -199,10 +199,10 @@ int ssl3_change_cipher_state(SSL *s, int which) 
	COMP_METHOD *comp;

	const EVP_MD *m;

	EVP_MD_CTX md;

	int exp,n,i,j,k,cl;

	int is_exp,n,i,j,k,cl;

	int reuse_dd = 0;



	exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);

	is_exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);

	c=s->s3->tmp.new_sym_enc;

	m=s->s3->tmp.new_hash;

	if (s->s3->tmp.new_compression == NULL)
@@ -276,9 +276,9 @@ int ssl3_change_cipher_state(SSL *s, int which) 
	p=s->s3->tmp.key_block;

	i=EVP_MD_size(m);

	cl=EVP_CIPHER_key_length(c);

	j=exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?

	j=is_exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?

		 cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl;

	/* Was j=(exp)?5:EVP_CIPHER_key_length(c); */

	/* Was j=(is_exp)?5:EVP_CIPHER_key_length(c); */

	k=EVP_CIPHER_iv_length(c);

	if (	(which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||

		(which == SSL3_CHANGE_CIPHER_SERVER_READ))
@@ -307,7 +307,7 @@ int ssl3_change_cipher_state(SSL *s, int which) 


	EVP_MD_CTX_init(&md);

	memcpy(mac_secret,ms,i);

	if (exp)

	if (is_exp)

		{

		/* In here I set both the read and write key/iv to the

		 * same value since only the correct one will be used :-).