Avoid some shadowed variable names.

Submitted by: Nils Larsch

diff --git a/apps/s_client.c b/apps/s_client.c
index 0f7dd88613ffc49dc1b6400f755c21075f18dca1..294aad8b59675a1d6d7ecc9e6fd9cf75a10db171 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -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)

diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index 8397cfab6a2cfbe5582f92e3cf1297c94ff26cbb..0f61768360140e8ceb1f691189e5ddd206a7ef97 100644 (file)
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -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

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index f80335e269f5a8cc804ee6667310913ffb6e449d..de74ec6df9d49d6210311d70828a2b70f77c7cf1 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -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;
 }

diff --git a/engines/vendor_defns/sureware.h b/engines/vendor_defns/sureware.h
index 1d3789219df93fc1bb177748197b651364a59682..4bc22027f90a3fc232f9e4c4a08824eeb94bcfd4 100644 (file)
--- a/engines/vendor_defns/sureware.h
+++ b/engines/vendor_defns/sureware.h
@@ -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;

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 56e274fe2ab84a052ad550156cc6f4e9b1ac518d..5d133eef14f08132b951ccf8fa60a8b4dc5937af 100644 (file)
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -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 :-).

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 4f0f700790e2bdb39cb9794415f66e9aa4b03f96..545999ac6eb65f653f1e59dc1f4048a2c0e678b8 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -952,7 +952,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
 char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)
        {
        int is_export,pkl,kl;
-       char *ver,*exp;
+       char *ver,*exp_str;
        char *kx,*au,*enc,*mac;
        unsigned long alg,alg2,alg_s;
 #ifdef KSSL_DEBUG
@@ -968,7 +968,7 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)
        is_export=SSL_C_IS_EXPORT(cipher);
        pkl=SSL_C_EXPORT_PKEYLENGTH(cipher);
        kl=SSL_C_EXPORT_KEYLENGTH(cipher);
-       exp=is_export?" export":"";
+       exp_str=is_export?" export":"";
        
        if (alg & SSL_SSLV2)
                ver="SSLv2";
@@ -1094,9 +1094,9 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)
                return("Buffer too small");
 
 #ifdef KSSL_DEBUG
-       BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp,alg);
+       BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp_str,alg);
 #else
-       BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp);
+       BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp_str);
 #endif /* KSSL_DEBUG */
        return(buf);
        }