wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused parameter in ssl_set_masks().

Browse source 
The ssl_set_masks() function no longer depends on the cipher. This
also means there is no need to set the masks for each cipher in
ssl3_choose_cipher.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-02-17 15:39:25 +00:00
parent 8c73aeb61e
commit 2cf28d6127
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ssl/s3_lib.c
View file

@ -3788,6 +3788,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
} }
tls1_set_cert_validity(s); tls1_set_cert_validity(s);
ssl_set_masks(s);
for (i = 0; i < sk_SSL_CIPHER_num(prio); i++) { for (i = 0; i < sk_SSL_CIPHER_num(prio); i++) {
c = sk_SSL_CIPHER_value(prio, i); c = sk_SSL_CIPHER_value(prio, i);
@ -3799,7 +3800,6 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
if ((c->algorithm_ssl & SSL_TLSV1) && s->version == SSL3_VERSION) if ((c->algorithm_ssl & SSL_TLSV1) && s->version == SSL3_VERSION)
continue; continue;
ssl_set_masks(s, c);
mask_k = s->s3->tmp.mask_k; mask_k = s->s3->tmp.mask_k;
mask_a = s->s3->tmp.mask_a; mask_a = s->s3->tmp.mask_a;
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP

4
ssl/ssl_lib.c
View file

@ -2493,7 +2493,7 @@ void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg)
ssl_cert_set_cert_cb(s->cert, cb, arg); ssl_cert_set_cert_cb(s->cert, cb, arg);
} }
void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher) void ssl_set_masks(SSL *s)
{ {
#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_GOST) #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_GOST)
CERT_PKEY *cpk; CERT_PKEY *cpk;
@ -2646,7 +2646,7 @@ CERT_PKEY *ssl_get_server_send_pkey(SSL *s)
c = s->cert; c = s->cert;
if (!s->s3 || !s->s3->tmp.new_cipher) if (!s->s3 || !s->s3->tmp.new_cipher)
return NULL; return NULL;
ssl_set_masks(s, s->s3->tmp.new_cipher); ssl_set_masks(s);
i = ssl_get_server_cert_index(s); i = ssl_get_server_cert_index(s);

2
ssl/ssl_locl.h
View file

@ -1854,7 +1854,7 @@ __owur int ssl_get_server_cert_serverinfo(SSL *s, const unsigned char **serverin
size_t *serverinfo_length); size_t *serverinfo_length);
__owur EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd); __owur EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd);
__owur int ssl_cert_type(X509 *x, EVP_PKEY *pkey); __owur int ssl_cert_type(X509 *x, EVP_PKEY *pkey);
void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher); void ssl_set_masks(SSL *s);
__owur STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); __owur STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
__owur int ssl_verify_alarm_type(long type); __owur int ssl_verify_alarm_type(long type);
void ssl_load_ciphers(void); void ssl_load_ciphers(void);