diff options
author | djm <> | 2011-11-03 02:32:23 +0000 |
---|---|---|
committer | djm <> | 2011-11-03 02:32:23 +0000 |
commit | 113f799ec7d1728f0a5d7ab5b0e3b42e3de56407 (patch) | |
tree | 26d712b25a8fa580b8f2dfc6df470ba5ffea9eb7 /src/lib/libssl/s23_lib.c | |
parent | 829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2 (diff) | |
download | openbsd-113f799ec7d1728f0a5d7ab5b0e3b42e3de56407.tar.gz openbsd-113f799ec7d1728f0a5d7ab5b0e3b42e3de56407.tar.bz2 openbsd-113f799ec7d1728f0a5d7ab5b0e3b42e3de56407.zip |
import OpenSSL 1.0.0e
Diffstat (limited to 'src/lib/libssl/s23_lib.c')
-rw-r--r-- | src/lib/libssl/s23_lib.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c index e3fce53430..3bf728318a 100644 --- a/src/lib/libssl/s23_lib.c +++ b/src/lib/libssl/s23_lib.c | |||
@@ -92,15 +92,8 @@ const SSL_CIPHER *ssl23_get_cipher(unsigned int u) | |||
92 | * available */ | 92 | * available */ |
93 | const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p) | 93 | const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p) |
94 | { | 94 | { |
95 | SSL_CIPHER c; | ||
96 | const SSL_CIPHER *cp; | 95 | const SSL_CIPHER *cp; |
97 | unsigned long id; | ||
98 | int n; | ||
99 | 96 | ||
100 | n=ssl3_num_ciphers(); | ||
101 | id=0x03000000|((unsigned long)p[0]<<16L)| | ||
102 | ((unsigned long)p[1]<<8L)|(unsigned long)p[2]; | ||
103 | c.id=id; | ||
104 | cp=ssl3_get_cipher_by_char(p); | 97 | cp=ssl3_get_cipher_by_char(p); |
105 | #ifndef OPENSSL_NO_SSL2 | 98 | #ifndef OPENSSL_NO_SSL2 |
106 | if (cp == NULL) | 99 | if (cp == NULL) |