diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-02-17 15:39:25 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-24 02:41:54 +0000 |
| commit | 2cf28d6127fdfbfb43d21b87514f08d925ca0c3a (patch) | |
| tree | 6937f22155e44c4e967fce704c5c44706fec223f /ssl/ssl_lib.c | |
| parent | 8c73aeb61e6df2bcd375532145fd7f97afbc3f11 (diff) | |
Remove unused parameter in ssl_set_masks().
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>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index fecd39200e..7c627312d6 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -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); |