diff options
| author |   jsg <jsg@openbsd.org> | 2014-04-17 14:08:57 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2014-04-17 14:08:57 +0000 |
| commit | c003cb2cb3d8d80466378b7f01965b45396ade46 (patch) | |
| tree | c6e229fe7add908b812233d543162b880cc5ef8f /lib/libssl | |
| parent | KNF. (diff) | |
| download | wireguard-openbsd-c003cb2cb3d8d80466378b7f01965b45396ade46.tar.xz wireguard-openbsd-c003cb2cb3d8d80466378b7f01965b45396ade46.zip | |
remove some code that is now unused after guenther's changes in 1.20.
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/s23_clnt.c | 17 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/s23_clnt.c | 17 |
2 files changed, 2 insertions, 32 deletions
diff --git a/lib/libssl/s23_clnt.c b/lib/libssl/s23_clnt.c index a7b262229f6..196ef1dfade 100644 --- a/lib/libssl/s23_clnt.c +++ b/lib/libssl/s23_clnt.c @@ -250,21 +250,6 @@ end: return (ret); } -static int -ssl23_no_ssl2_ciphers(SSL *s) -{ - SSL_CIPHER *cipher; - STACK_OF(SSL_CIPHER) *ciphers; - int i; - ciphers = SSL_get_ciphers(s); - for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { - cipher = sk_SSL_CIPHER_value(ciphers, i); - if (cipher->algorithm_ssl == SSL_SSLV2) - return 0; - } - return 1; -} - /* * Fill a ClientRandom or ServerRandom field of length len. Returns <= 0 * on failure, 1 on success. @@ -294,7 +279,7 @@ ssl23_client_hello(SSL *s) { unsigned char *buf; unsigned char *p, *d; - int i, ch_len; + int i; unsigned long l; int version = 0, version_major, version_minor; #ifndef OPENSSL_NO_COMP diff --git a/lib/libssl/src/ssl/s23_clnt.c b/lib/libssl/src/ssl/s23_clnt.c index a7b262229f6..196ef1dfade 100644 --- a/lib/libssl/src/ssl/s23_clnt.c +++ b/lib/libssl/src/ssl/s23_clnt.c @@ -250,21 +250,6 @@ end: return (ret); } -static int -ssl23_no_ssl2_ciphers(SSL *s) -{ - SSL_CIPHER *cipher; - STACK_OF(SSL_CIPHER) *ciphers; - int i; - ciphers = SSL_get_ciphers(s); - for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { - cipher = sk_SSL_CIPHER_value(ciphers, i); - if (cipher->algorithm_ssl == SSL_SSLV2) - return 0; - } - return 1; -} - /* * Fill a ClientRandom or ServerRandom field of length len. Returns <= 0 * on failure, 1 on success. @@ -294,7 +279,7 @@ ssl23_client_hello(SSL *s) { unsigned char *buf; unsigned char *p, *d; - int i, ch_len; + int i; unsigned long l; int version = 0, version_major, version_minor; #ifndef OPENSSL_NO_COMP |