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

In the absence of feedback either way, commit the fix that looks right for

Browse Source 
wrong keylength with export null ciphers.
This commit is contained in:
Ben Laurie
1999-02-13 12:39:50 +00:00
parent be560e7b67
commit 436d318c80
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ssl/s3_enc.c
View File

@@ -139,7 +139,7 @@ int which;
COMP_METHOD *comp;
EVP_MD *m;
MD5_CTX md;
int exp,n,i,j,k;
int exp,n,i,j,k,cl;
exp=(s->s3->tmp.new_cipher->algorithms & SSL_EXPORT)?1:0;
c=s->s3->tmp.new_sym_enc;
@@ -208,8 +208,9 @@ int which;
p=s->s3->tmp.key_block;
i=EVP_MD_size(m);
/* Should be j=exp?min(5,EVP_CIPHER_key_length(c)):EVP_CIPHER_key_length(c); ?? - Ben 30/12/98 */
j=(exp)?5:EVP_CIPHER_key_length(c);
cl=EVP_CIPHER_key_length(c);
j=exp ? (cl < 5 ? cl : 5) : cl;
/* Was j=(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))

6
ssl/t1_enc.c
View File

@@ -177,7 +177,7 @@ int which;
EVP_CIPHER *c;
COMP_METHOD *comp;
EVP_MD *m;
int exp,n,i,j,k,exp_label_len;
int exp,n,i,j,k,exp_label_len,cl;
exp=(s->s3->tmp.new_cipher->algorithms & SSL_EXPORT)?1:0;
c=s->s3->tmp.new_sym_enc;
@@ -244,7 +244,9 @@ int which;
p=s->s3->tmp.key_block;
i=EVP_MD_size(m);
j=(exp)?5:EVP_CIPHER_key_length(c);
cl=EVP_CIPHER_key_length(c);
j=exp ? (cl < 5 ? cl : 5) : cl;
/* Was j=(exp)?5:EVP_CIPHER_key_length(c); */
k=EVP_CIPHER_iv_length(c);
er1= &(s->s3->client_random[0]);
er2= &(s->s3->server_random[0]);