From 3e6620b05005703104bc76bb7ab704a725e99897 Mon Sep 17 00:00:00 2001 From: jsing Date: Sun, 10 Aug 2014 14:42:55 +0000 Subject: Since we no longer need to support SSLv2-style cipher lists, start unravelling the maze of function pointers and callbacks by directly calling ssl3_{get,put}_cipher_by_char() and removing the ssl_{get,put}_cipher_by_char macros. Prompted by similar changes in boringssl. ok guenther. --- lib/libssl/s3_srvr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/libssl/s3_srvr.c') diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c index ed2aaf19b52..7b29ec41c83 100644 --- a/lib/libssl/s3_srvr.c +++ b/lib/libssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.79 2014/07/28 04:23:12 guenther Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.80 2014/08/10 14:42:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -184,8 +184,6 @@ const SSL_METHOD SSLv3_server_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .ssl_ctrl = ssl3_ctrl, .ssl_ctx_ctrl = ssl3_ctx_ctrl, - .get_cipher_by_char = ssl3_get_cipher_by_char, - .put_cipher_by_char = ssl3_put_cipher_by_char, .ssl_pending = ssl3_pending, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, -- cgit v1.2.3-59-g8ed1b