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

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
Download Patch File Download Diff File Expand all files Collapse all files

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);
}
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)
CERT_PKEY *cpk;
@@ -2646,7 +2646,7 @@ CERT_PKEY *ssl_get_server_send_pkey(SSL *s)
c = s->cert;
if (!s->s3 || !s->s3->tmp.new_cipher)
return NULL;
ssl_set_masks(s, s->s3->tmp.new_cipher);
ssl_set_masks(s);
i = ssl_get_server_cert_index(s);