5 files changed, 10 insertions, 13 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 41dc37b..47f0077 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -429,6 +429,7 @@ set(
         evp/m_gostr341194.c
         evp/m_md4.c
         evp/m_md5.c
+        evp/m_md5_sha1.c
         evp/m_null.c
         evp/m_ripemd.c
         evp/m_sha1.c
@@ -736,8 +737,10 @@ endif()
 
 if(NOT HAVE_ARC4RANDOM_BUF)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c)
         set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random)
         set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform)
 
         if(NOT HAVE_GETENTROPY)
                 if(CMAKE_HOST_WIN32)
@@ -761,11 +764,6 @@ if(NOT HAVE_ARC4RANDOM_BUF)
         endif()
 endif()
 
-if(NOT HAVE_ARC4RANDOM_UNIFORM)
-        set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c)
-        set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform)
-endif()
-
 if(NOT HAVE_TIMINGSAFE_BCMP)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c)
         set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp)
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 26def2a..23aaeac 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -527,6 +527,7 @@ libcrypto_la_SOURCES += evp/m_gost2814789.c
 libcrypto_la_SOURCES += evp/m_gostr341194.c
 libcrypto_la_SOURCES += evp/m_md4.c
 libcrypto_la_SOURCES += evp/m_md5.c
+libcrypto_la_SOURCES += evp/m_md5_sha1.c
 libcrypto_la_SOURCES += evp/m_null.c
 libcrypto_la_SOURCES += evp/m_ripemd.c
 libcrypto_la_SOURCES += evp/m_sha1.c
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4
index c66364e..53ffce6 100644
--- a/m4/check-libc.m4
+++ b/m4/check-libc.m4
@@ -152,14 +152,13 @@ echo "generating $crypto_p_sym ..."
 chmod u+w $srcdir/crypto
 cp $crypto_sym $crypto_p_sym
 chmod u+w $crypto_p_sym
-if test "x$ac_cv_func_arc4random" = "xno" ; then
-        echo arc4random >> $crypto_p_sym
-fi
 if test "x$ac_cv_func_arc4random_buf" = "xno" ; then
+        echo arc4random >> $crypto_p_sym
         echo arc4random_buf >> $crypto_p_sym
-fi
-if test "x$ac_cv_func_arc4random_uniform" = "xno" ; then
         echo arc4random_uniform >> $crypto_p_sym
+        if test "x$ac_cv_func_getentropy" = "xno" ; then
+                echo getentropy >> $crypto_p_sym
+        fi
 fi
 if test "x$ac_cv_func_asprintf" = "xno" ; then
         echo asprintf >> $crypto_p_sym
@@ -168,9 +167,6 @@ fi
 if test "x$ac_cv_func_explicit_bzero" = "xno" ; then
         echo explicit_bzero >> $crypto_p_sym
 fi
-if test "x$ac_cv_func_getentropy" = "xno" ; then
-        echo getentropy >> $crypto_p_sym
-fi
 if test "x$ac_cv_func_inet_pton" = "xno" ; then
         echo inet_pton >> $crypto_p_sym
 fi
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index b555c9e..bc2fea4 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -39,6 +39,7 @@ set(
         ssl_versions.c
         t1_clnt.c
         t1_enc.c
+        t1_hash.c
         t1_lib.c
         t1_meth.c
         t1_reneg.c
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 4da6d58..3c348d3 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -42,6 +42,7 @@ 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_reneg.c