Misc fixes to bring portable in line with upstream.

2 files changed, 2 insertions, 8 deletions

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 8596d25..5c13e5d 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -8,7 +8,6 @@ set(
         d1_clnt.c
         d1_enc.c
         d1_lib.c
-        d1_meth.c
         d1_pkt.c
         d1_srtp.c
         d1_srvr.c
@@ -24,6 +23,7 @@ set(
         ssl_err.c
         ssl_init.c
         ssl_lib.c
+        ssl_methods.c
         ssl_packet.c
         ssl_pkt.c
         ssl_rsa.c
@@ -33,12 +33,9 @@ set(
         ssl_tlsext.c
         ssl_txt.c
         ssl_versions.c
-        t1_clnt.c
         t1_enc.c
         t1_hash.c
         t1_lib.c
-        t1_meth.c
-        t1_srvr.c
 )
 
 add_library(ssl ${SSL_SRC})
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 189876e..8263749 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -17,7 +17,6 @@ libssl_la_SOURCES += d1_both.c
 libssl_la_SOURCES += d1_clnt.c
 libssl_la_SOURCES += d1_enc.c
 libssl_la_SOURCES += d1_lib.c
-libssl_la_SOURCES += d1_meth.c
 libssl_la_SOURCES += d1_pkt.c
 libssl_la_SOURCES += d1_srtp.c
 libssl_la_SOURCES += d1_srvr.c
@@ -33,6 +32,7 @@ libssl_la_SOURCES += ssl_clnt.c
 libssl_la_SOURCES += ssl_err.c
 libssl_la_SOURCES += ssl_init.c
 libssl_la_SOURCES += ssl_lib.c
+libssl_la_SOURCES += ssl_methods.c
 libssl_la_SOURCES += ssl_packet.c
 libssl_la_SOURCES += ssl_pkt.c
 libssl_la_SOURCES += ssl_rsa.c
@@ -42,12 +42,9 @@ libssl_la_SOURCES += ssl_stat.c
 libssl_la_SOURCES += ssl_tlsext.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_hash.c
 libssl_la_SOURCES += t1_lib.c
-libssl_la_SOURCES += t1_meth.c
-libssl_la_SOURCES += t1_srvr.c
 
 noinst_HEADERS = srtp.h
 noinst_HEADERS += ssl_locl.h