diff options
author | djm <> | 2010-10-01 22:54:21 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:54:21 +0000 |
commit | 829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2 (patch) | |
tree | e03b9f1bd051e844b971936729e9df549a209130 /src/lib/libssl/s23_lib.c | |
parent | e6b755d2a53d3cac7a344dfdd6bf7c951cac754c (diff) | |
download | openbsd-829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2.tar.gz openbsd-829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2.tar.bz2 openbsd-829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2.zip |
import OpenSSL-1.0.0a
Diffstat (limited to 'src/lib/libssl/s23_lib.c')
-rw-r--r-- | src/lib/libssl/s23_lib.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c index fc2981308d..e3fce53430 100644 --- a/src/lib/libssl/s23_lib.c +++ b/src/lib/libssl/s23_lib.c | |||
@@ -65,11 +65,6 @@ long ssl23_default_timeout(void) | |||
65 | return(300); | 65 | return(300); |
66 | } | 66 | } |
67 | 67 | ||
68 | IMPLEMENT_ssl23_meth_func(sslv23_base_method, | ||
69 | ssl_undefined_function, | ||
70 | ssl_undefined_function, | ||
71 | ssl_bad_method) | ||
72 | |||
73 | int ssl23_num_ciphers(void) | 68 | int ssl23_num_ciphers(void) |
74 | { | 69 | { |
75 | return(ssl3_num_ciphers() | 70 | return(ssl3_num_ciphers() |
@@ -79,7 +74,7 @@ int ssl23_num_ciphers(void) | |||
79 | ); | 74 | ); |
80 | } | 75 | } |
81 | 76 | ||
82 | SSL_CIPHER *ssl23_get_cipher(unsigned int u) | 77 | const SSL_CIPHER *ssl23_get_cipher(unsigned int u) |
83 | { | 78 | { |
84 | unsigned int uu=ssl3_num_ciphers(); | 79 | unsigned int uu=ssl3_num_ciphers(); |
85 | 80 | ||
@@ -95,9 +90,10 @@ SSL_CIPHER *ssl23_get_cipher(unsigned int u) | |||
95 | 90 | ||
96 | /* This function needs to check if the ciphers required are actually | 91 | /* This function needs to check if the ciphers required are actually |
97 | * available */ | 92 | * available */ |
98 | SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p) | 93 | const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p) |
99 | { | 94 | { |
100 | SSL_CIPHER c,*cp; | 95 | SSL_CIPHER c; |
96 | const SSL_CIPHER *cp; | ||
101 | unsigned long id; | 97 | unsigned long id; |
102 | int n; | 98 | int n; |
103 | 99 | ||