From 68edd00d9258df93b1366c71ac124e0cadf7bc08 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 29 Apr 2005 05:39:33 +0000
Subject: resolve conflicts

---
 src/lib/libssl/s23_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/libssl/s23_lib.c')

diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c
index b70002a647..8d7dbcf569 100644
--- a/src/lib/libssl/s23_lib.c
+++ b/src/lib/libssl/s23_lib.c
@@ -87,7 +87,7 @@ static SSL_METHOD SSLv23_data= {
 	ssl3_ctx_ctrl,
 	ssl23_get_cipher_by_char,
 	ssl23_put_cipher_by_char,
-	ssl_undefined_function,
+	ssl_undefined_const_function,
 	ssl23_num_ciphers,
 	ssl23_get_cipher,
 	ssl_bad_method,
-- 
cgit v1.2.3-55-g6feb