diff options
| author | Emilia Kasper <emilia@openssl.org> | 2015-09-18 15:00:37 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2015-09-22 20:34:25 +0200 |
| commit | e9fa092efca0afbf99bb575193f69e3f8a938f02 (patch) | |
| tree | 6a4610b37c5249d3176c0a778adfa613be3b1ff8 /ssl/ssl_lib.c | |
| parent | 21b0fa91186ff1c1c3d956c0593ef4ac02521695 (diff) | |
Remove ssl_put_cipher_by_char
Since SSLv3, a CipherSuite is always 2 bytes. The only place where we
need 3-byte ciphers is SSLv2-compatible ClientHello processing.
So, remove the ssl_put_cipher_by_char indirection.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index e794d82058..6d1e4e8064 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1078,8 +1078,9 @@ long SSL_ctrl(SSL *s, int cmd, long larg, void *parg) return 0; *(unsigned char **)parg = s->s3->tmp.ciphers_raw; return (int)s->s3->tmp.ciphers_rawlen; - } else - return ssl_put_cipher_by_char(s, NULL, NULL); + } else { + return TLS_CIPHER_LEN; + } case SSL_CTRL_GET_EXTMS_SUPPORT: if (!s->session || SSL_in_init(s) || s->in_handshake) return -1; |