projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for new TLS export ciphersuites.
[openssl.git]
/
ssl
/
s3_enc.c
diff --git
a/ssl/s3_enc.c
b/ssl/s3_enc.c
index a655e12becb172caa449d48ef79ba4dee6ad7166..d79d9272d6526447797ba5513d84b28c3660d5e0 100644
(file)
--- a/
ssl/s3_enc.c
+++ b/
ssl/s3_enc.c
@@
-141,7
+141,7
@@
int which;
MD5_CTX md;
int exp,n,i,j,k,cl;
MD5_CTX md;
int exp,n,i,j,k,cl;
- exp=
(s->s3->tmp.new_cipher->algorithms & SSL_EXPORT)?1:0
;
+ 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)
c=s->s3->tmp.new_sym_enc;
m=s->s3->tmp.new_hash;
if (s->s3->tmp.new_compression == NULL)
@@
-213,7
+213,8
@@
int which;
p=s->s3->tmp.key_block;
i=EVP_MD_size(m);
cl=EVP_CIPHER_key_length(c);
p=s->s3->tmp.key_block;
i=EVP_MD_size(m);
cl=EVP_CIPHER_key_length(c);
- j=exp ? (cl < 5 ? cl : 5) : cl;
+ j=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); */
k=EVP_CIPHER_iv_length(c);
if ( (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
/* Was j=(exp)?5:EVP_CIPHER_key_length(c); */
k=EVP_CIPHER_iv_length(c);
if ( (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
@@
-283,7
+284,7
@@
SSL *s;
unsigned char *p;
EVP_CIPHER *c;
EVP_MD *hash;
unsigned char *p;
EVP_CIPHER *c;
EVP_MD *hash;
- int num
,exp
;
+ int num;
SSL_COMP *comp;
if (s->s3->tmp.key_block_length != 0)
SSL_COMP *comp;
if (s->s3->tmp.key_block_length != 0)
@@
-299,8
+300,6
@@
SSL *s;
s->s3->tmp.new_hash=hash;
s->s3->tmp.new_compression=comp;
s->s3->tmp.new_hash=hash;
s->s3->tmp.new_compression=comp;
- exp=(s->session->cipher->algorithms & SSL_EXPORT)?1:0;
-
num=EVP_CIPHER_key_length(c)+EVP_MD_size(hash)+EVP_CIPHER_iv_length(c);
num*=2;
num=EVP_CIPHER_key_length(c)+EVP_MD_size(hash)+EVP_CIPHER_iv_length(c);
num*=2;