summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libssl/s23_clnt.c8
-rw-r--r--lib/libssl/s23_lib.c30
-rw-r--r--lib/libssl/s23_srvr.c8
-rw-r--r--lib/libssl/ssl_locl.h5
4 files changed, 10 insertions, 41 deletions
diff --git a/lib/libssl/s23_clnt.c b/lib/libssl/s23_clnt.c
index e2f1544486b..3a72dd3316b 100644
--- a/lib/libssl/s23_clnt.c
+++ b/lib/libssl/s23_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_clnt.c,v 1.30 2014/07/10 08:51:14 tedu Exp $ */
+/* $OpenBSD: s23_clnt.c,v 1.31 2014/07/11 08:17:36 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -139,11 +139,11 @@ const SSL_METHOD SSLv23_client_method_data = {
.ssl_dispatch_alert = ssl3_dispatch_alert,
.ssl_ctrl = ssl3_ctrl,
.ssl_ctx_ctrl = ssl3_ctx_ctrl,
- .get_cipher_by_char = ssl23_get_cipher_by_char,
+ .get_cipher_by_char = ssl3_get_cipher_by_char,
.put_cipher_by_char = ssl23_put_cipher_by_char,
.ssl_pending = ssl_undefined_const_function,
- .num_ciphers = ssl23_num_ciphers,
- .get_cipher = ssl23_get_cipher,
+ .num_ciphers = ssl3_num_ciphers,
+ .get_cipher = ssl3_get_cipher,
.get_ssl_method = ssl23_get_client_method,
.get_timeout = ssl23_default_timeout,
.ssl3_enc = &ssl3_undef_enc_method,
diff --git a/lib/libssl/s23_lib.c b/lib/libssl/s23_lib.c
index a879a637eac..643910be697 100644
--- a/lib/libssl/s23_lib.c
+++ b/lib/libssl/s23_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_lib.c,v 1.15 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: s23_lib.c,v 1.16 2014/07/11 08:17:36 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -67,34 +67,6 @@ ssl23_default_timeout(void)
}
int
-ssl23_num_ciphers(void)
-{
- return (ssl3_num_ciphers());
-}
-
-const SSL_CIPHER *
-ssl23_get_cipher(unsigned int u)
-{
- unsigned int uu = ssl3_num_ciphers();
-
- if (u < uu)
- return (ssl3_get_cipher(u));
- else
- return (NULL);
-}
-
-/* This function needs to check if the ciphers required are actually
- * available */
-const SSL_CIPHER *
-ssl23_get_cipher_by_char(const unsigned char *p)
-{
- const SSL_CIPHER *cp;
-
- cp = ssl3_get_cipher_by_char(p);
- return (cp);
-}
-
-int
ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
{
long l;
diff --git a/lib/libssl/s23_srvr.c b/lib/libssl/s23_srvr.c
index caeb34b78e9..e6356ba2a28 100644
--- a/lib/libssl/s23_srvr.c
+++ b/lib/libssl/s23_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_srvr.c,v 1.30 2014/07/10 08:51:14 tedu Exp $ */
+/* $OpenBSD: s23_srvr.c,v 1.31 2014/07/11 08:17:36 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -138,11 +138,11 @@ const SSL_METHOD SSLv23_server_method_data = {
.ssl_dispatch_alert = ssl3_dispatch_alert,
.ssl_ctrl = ssl3_ctrl,
.ssl_ctx_ctrl = ssl3_ctx_ctrl,
- .get_cipher_by_char = ssl23_get_cipher_by_char,
+ .get_cipher_by_char = ssl3_get_cipher_by_char,
.put_cipher_by_char = ssl23_put_cipher_by_char,
.ssl_pending = ssl_undefined_const_function,
- .num_ciphers = ssl23_num_ciphers,
- .get_cipher = ssl23_get_cipher,
+ .num_ciphers = ssl3_num_ciphers,
+ .get_cipher = ssl3_get_cipher,
.get_ssl_method = ssl23_get_server_method,
.get_timeout = ssl23_default_timeout,
.ssl3_enc = &ssl3_undef_enc_method,
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h
index 150f56e1d68..c1e402b3a13 100644
--- a/lib/libssl/ssl_locl.h
+++ b/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.58 2014/07/10 10:09:54 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.59 2014/07/11 08:17:36 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -659,13 +659,10 @@ void ssl3_record_sequence_increment(unsigned char *seq);
int ssl3_do_change_cipher_spec(SSL *ssl);
long ssl3_default_timeout(void);
-int ssl23_num_ciphers(void);
-const SSL_CIPHER *ssl23_get_cipher(unsigned int u);
int ssl23_read(SSL *s, void *buf, int len);
int ssl23_peek(SSL *s, void *buf, int len);
int ssl23_write(SSL *s, const void *buf, int len);
int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
-const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
long ssl23_default_timeout(void);
long tls1_default_timeout(void);