generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change 'exp' to something else, as 'exp' is predefined by GNU C. This

Browse Source 
was already done in HEAD, but not in this branch (I wonder why...).
This commit is contained in:
Richard Levitte 2003-12-27 14:24:20 +00:00
parent 8f5c833f3c
commit ec2a595627
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/bio/b_print.c
View File

@ -576,12 +576,12 @@ abs_val(LDOUBLE value)
} }
static LDOUBLE static LDOUBLE
pow10(int exp) pow10(int in_exp)
{ {
LDOUBLE result = 1; LDOUBLE result = 1;
while (exp) { while (in_exp) {
result *= 10; result *= 10;
exp--; in_exp--;
} }
return result; return result;
} }

12
ssl/s3_enc.c
View File

@ -199,10 +199,10 @@ int ssl3_change_cipher_state(SSL *s, int which)
COMP_METHOD *comp; COMP_METHOD *comp;
const EVP_MD *m; const EVP_MD *m;
EVP_MD_CTX md; EVP_MD_CTX md;
int exp,n,i,j,k,cl; int is_exp,n,i,j,k,cl;
int reuse_dd = 0; 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; c=s->s3->tmp.new_sym_enc;
m=s->s3->tmp.new_hash; m=s->s3->tmp.new_hash;
if (s->s3->tmp.new_compression == NULL) 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; p=s->s3->tmp.key_block;
i=EVP_MD_size(m); i=EVP_MD_size(m);
cl=EVP_CIPHER_key_length(c); 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; 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); k=EVP_CIPHER_iv_length(c);
if ( (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) || if ( (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
(which == SSL3_CHANGE_CIPHER_SERVER_READ)) (which == SSL3_CHANGE_CIPHER_SERVER_READ))
@ -307,7 +307,7 @@ int ssl3_change_cipher_state(SSL *s, int which)
EVP_MD_CTX_init(&md); EVP_MD_CTX_init(&md);
memcpy(mac_secret,ms,i); memcpy(mac_secret,ms,i);
if (exp) if (is_exp)
{ {
/* In here I set both the read and write key/iv to the /* In here I set both the read and write key/iv to the
* same value since only the correct one will be used :-). * same value since only the correct one will be used :-).