From beffe6b41d1ee3c7f88af4866ca5d39e3beacca1 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Fri, 27 Jan 2017 05:42:10 -0600
Subject: [PATCH] update for death of s23*

---
 ssl/CMakeLists.txt | 15 ++++++---------
 ssl/Makefile.am    | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 67115e4..b555c9e 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -19,27 +19,24 @@ set(
 	d1_srtp.c
 	d1_srvr.c
 	pqueue.c
-	s23_clnt.c
-	s23_lib.c
-	s23_pkt.c
-	s23_srvr.c
-	s3_both.c
 	s3_cbc.c
-	s3_clnt.c
 	s3_lib.c
-	s3_pkt.c
-	s3_srvr.c
 	ssl_algs.c
 	ssl_asn1.c
+	ssl_both.c
 	ssl_cert.c
 	ssl_ciph.c
+	ssl_clnt.c
 	ssl_err.c
-	ssl_err2.c
 	ssl_lib.c
+	ssl_packet.c
+	ssl_pkt.c
 	ssl_rsa.c
 	ssl_sess.c
+	ssl_srvr.c
 	ssl_stat.c
 	ssl_txt.c
+	ssl_versions.c
 	t1_clnt.c
 	t1_enc.c
 	t1_lib.c
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 59a4d23..4da6d58 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -22,27 +22,24 @@ libssl_la_SOURCES += d1_pkt.c
 libssl_la_SOURCES += d1_srtp.c
 libssl_la_SOURCES += d1_srvr.c
 libssl_la_SOURCES += pqueue.c
-libssl_la_SOURCES += s23_clnt.c
-libssl_la_SOURCES += s23_lib.c
-libssl_la_SOURCES += s23_pkt.c
-libssl_la_SOURCES += s23_srvr.c
-libssl_la_SOURCES += s3_both.c
 libssl_la_SOURCES += s3_cbc.c
-libssl_la_SOURCES += s3_clnt.c
 libssl_la_SOURCES += s3_lib.c
-libssl_la_SOURCES += s3_pkt.c
-libssl_la_SOURCES += s3_srvr.c
 libssl_la_SOURCES += ssl_algs.c
 libssl_la_SOURCES += ssl_asn1.c
+libssl_la_SOURCES += ssl_both.c
 libssl_la_SOURCES += ssl_cert.c
 libssl_la_SOURCES += ssl_ciph.c
+libssl_la_SOURCES += ssl_clnt.c
 libssl_la_SOURCES += ssl_err.c
-libssl_la_SOURCES += ssl_err2.c
 libssl_la_SOURCES += ssl_lib.c
+libssl_la_SOURCES += ssl_packet.c
+libssl_la_SOURCES += ssl_pkt.c
 libssl_la_SOURCES += ssl_rsa.c
 libssl_la_SOURCES += ssl_sess.c
+libssl_la_SOURCES += ssl_srvr.c
 libssl_la_SOURCES += ssl_stat.c
 libssl_la_SOURCES += ssl_txt.c
+libssl_la_SOURCES += ssl_versions.c
 libssl_la_SOURCES += t1_clnt.c
 libssl_la_SOURCES += t1_enc.c
 libssl_la_SOURCES += t1_lib.c