Fix OpenSSL builds after new releases

Author: bjori

.evergreen/compile-unix.sh

@@ -46,13 +46,16 @@ install_openssl_fips() {
    SSL=${SSL%-fips}
 }
 install_openssl () {
-   curl --retry 5 -o ssl.tar.gz https://www.openssl.org/source/$SSL.tar.gz
+   SSL_VERSION=${SSL##openssl-}
+   tmp=$(echo $SSL_VERSION | tr . _)
+   curl -L --retry 5 -o ssl.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_${tmp}.tar.gz
    tar zxvf ssl.tar.gz
-   cd $SSL
+   cd openssl-OpenSSL_$tmp
    ./config --prefix=$INSTALL_DIR $SSL_EXTRA_FLAGS shared -fPIC
    cpus=$(grep -c '^processor' /proc/cpuinfo)
+   make -j32 || true
    make -j${cpus} || true
-   make install_sw install_ssldirs || true
+   make install || true
    cd ..
 
    # x505_vfy.h has issues in 1.1.0e
@@ -63,6 +66,7 @@ install_openssl () {
 }
 
 install_libressl () {
+   SSL_VERSION=${SSL##libressl-}
    curl --retry 5 -o ssl.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$SSL.tar.gz
    tar zxvf ssl.tar.gz
    cd $SSL
@@ -247,6 +251,9 @@ $SCAN_BUILD $CONFIGURE_SCRIPT $CONFIGURE_FLAGS
 export LD_LIBRARY_PATH=$EXTRA_LIB_PATH:$LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH=$EXTRA_LIB_PATH:$DYLD_LIBRARY_PATH
 openssl version
+if [ -n "$SSL_VERSION" ]; then
+   openssl version | grep -q $SSL_VERSION
+fi
 # This should fail when using fips capable OpenSSL when fips mode is enabled
 openssl md5 README.rst || true
 $SCAN_BUILD make all

.evergreen/config.yml

@@ -6320,7 +6320,7 @@ tasks:
             script: |
               set -o errexit
               set -o xtrace
-              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SASL=no SSL=openssl-1.0.2k sh .evergreen/compile.sh
+              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SASL=no SSL=openssl-1.0.2l sh .evergreen/compile.sh
         - func: "run auth tests"
         - func: "upload build"
 
@@ -6333,7 +6333,7 @@ tasks:
             script: |
               set -o errexit
               set -o xtrace
-              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SASL=no SSL=openssl-1.1.0e sh .evergreen/compile.sh
+              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SASL=no SSL=openssl-1.1.0f sh .evergreen/compile.sh
         - func: "run auth tests"
         - func: "upload build"
 

tests/test-mongoc-stream-tls.c

@@ -364,7 +364,7 @@ test_mongoc_tls_ip (void)
 
 
 #if !defined(__APPLE__) && !defined(_WIN32) && \
-   defined(MONGOC_ENABLE_SSL_OPENSSL)
+   defined(MONGOC_ENABLE_SSL_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10000000L
 static void
 test_mongoc_tls_trust_dir (void)
 {
@@ -374,7 +374,7 @@ test_mongoc_tls_trust_dir (void)
    ssl_test_result_t cr;
 
    sopt.pem_file = CERT_SERVER;
-   sopt.ca_dir = CERT_CA;
+   sopt.ca_file = CERT_CA;
 
    copt.ca_dir = CERT_TEST_DIR;
 
@@ -415,7 +415,7 @@ test_stream_tls_install (TestSuite *suite)
 #endif
 
 #if !defined(__APPLE__) && !defined(_WIN32) && \
-   defined(MONGOC_ENABLE_SSL_OPENSSL)
+   defined(MONGOC_ENABLE_SSL_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10000000L
    TestSuite_Add (suite, "/TLS/trust_dir", test_mongoc_tls_trust_dir);
 #endif
 #endif