Remove openssl-0.9.8 support

microsoft · Oct 10, 2018 · f738c39 · f738c39
1 parent b66f646
commit f738c39
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 40 deletions.
diff --git a/Unix/configure b/Unix/configure
@@ -317,11 +317,6 @@ do
         disable_makefile_gen=1
         ;;
 
-    --disable-ssl-0.9.8)
-        disable_ssl_0_9_8=1
-        ;;
-
-
     *)
         echo "$0: unknown option:  $opt"
         exit 1
@@ -415,8 +410,6 @@ OPTIONS:
                             builds of OMI, including ULINUX as necessary
     --disable-makefile-gen  Disable Makefile generation (used internally for
                             universal builds)
-    --disable-ssl-0.9.8     When building with --enable-ulinux, skip the ssl
-                            0.9.8 build and only do ssl 1.0.0.
 EOF
     exit 0
 fi
@@ -477,25 +470,20 @@ fi
 ##==============================================================================
 
 if [ "$enable_ulinux" = "1" ]; then
-    openssl098_dir=/usr/local_ssl_0.9.8
     openssl100_dir=/usr/local_ssl_1.0.0
     openssl110_dir=/usr/local_ssl_1.1.0
 
     case "`uname -m`" in    
         x86_64 )
-            openssl098_libdir=${openssl098_dir}/lib
             openssl100_libdir=${openssl100_dir}/lib64
             openssl110_libdir=${openssl110_dir}/lib
             ;;
 
         * )
-            openssl098_libdir=${openssl098_dir}/lib
             openssl100_libdir=${openssl100_dir}/lib
             ;;
     esac
 
-    openssl098_cflags=`PKG_CONFIG_PATH=$openssl098_libdir/pkgconfig $pkgconfig --cflags openssl`
-    openssl098_libs=`PKG_CONFIG_PATH=$openssl098_libdir/pkgconfig $pkgconfig --libs openssl`
     openssl100_cflags=`PKG_CONFIG_PATH=$openssl100_libdir/pkgconfig $pkgconfig --cflags openssl`
     openssl100_libs=`PKG_CONFIG_PATH=$openssl100_libdir/pkgconfig $pkgconfig --libs openssl`
 
@@ -504,15 +492,6 @@ if [ "$enable_ulinux" = "1" ]; then
 	openssl110_libs=`PKG_CONFIG_PATH=$openssl110_libdir/pkgconfig $pkgconfig --libs openssl`
     fi
 
-    if [ "$disable_ssl_0_9_8" != "1" ]; then
-        echo "checking for local installation of openssl version 0.9.8 on system ..."
-        if [ ! -d "$openssl098_dir" ]; then
-            echo "did not find ${openssl098_dir}, which is required."
-            echo "you must install a local copy of openssl version 0.9.8 to build successfully."
-            exit 1
-        fi
-    fi
-
     echo "checking for local installation of openssl version 1.0.0 on system ..."
     if [ ! -d "$openssl100_dir" ]; then
         echo "did not find ${openssl100_dir}, which is required."
@@ -2507,7 +2486,6 @@ export ROOT=$root
 export ENABLE_DEBUG=$enable_debug
 export ENABLE_ULINUX=$enable_ulinux
 export ENABLE_NATIVE_KITS=$enable_native_kits
-export DISABLE_SSL_0_9_8=$disable_ssl_0_9_8
 export DISABLE_SSL_1_1_0=$disable_ssl_1_1_0
 
 OMI_CONFIGURE_QUALS=--enable-microsoft --disable-makefile-gen
@@ -2522,14 +2500,6 @@ endif
 all:
 ifeq (\$(ENABLE_ULINUX),1)
 
-ifneq (\$(DISABLE_SSL_0_9_8),1)
-	@echo '========================= Performing Building OMI (SSL 0.9.8)'
-
-	@echo Running: ./configure \$(OMI_CONFIGURE_QUALS) --outputdirname=output_openssl_0.9.8 --opensslcflags="${openssl098_cflags}" --openssllibs="${openssl098_libs}" --openssllibdir="${openssl098_libdir}"; \
-	./configure \$(OMI_CONFIGURE_QUALS) --outputdirname=output_openssl_0.9.8 --opensslcflags="${openssl098_cflags}" --openssllibs="${openssl098_libs}" --openssllibdir="${openssl098_libdir}"; \
-	( cd \$(__ROOT); OUTPUTDIR=${root}/output_openssl_0.9.8; SSL_BUILD=0.9.8; \$(MAKE) -f build.mak )
-endif
-
 	@echo '========================= Performing Building OMI (SSL 1.0.0)'
 
 	echo Running: ./configure \$(OMI_CONFIGURE_QUALS) --outputdirname=output_openssl_1.0.0 --opensslcflags="${openssl100_cflags}" --openssllibs="${openssl100_libs}" --openssllibdir="${openssl100_libdir}"; \

diff --git a/Unix/installbuilder/GNUmakefile b/Unix/installbuilder/GNUmakefile
@@ -4,20 +4,18 @@ include $(TOP)/config.mak
 
 # $(OUTPUTDIRNAME) will be something like:
 #    output
-#    output_openssl_0.9.8
 #    output_openssl_1.0.0
 #    output_openssl_1.1.0
 #
 # Get this into some reasonable prefix for the package directory.
 #
 #    omi/Packages - good for only one set of packages
-#    omi/Packages/openssl_0.9.8 - good for binaries for OpenSSL 0.9.8
 #    omi/Packages/openssl_1.0.0 - good for binaries for OpenSSL 1.0.0
 #    omi/Packages/openssl_1.1.0 - good for binaries for OpenSSL 1.1.0
 #
 # This makes it easier for Jenkins to have a reasonable directory layout
 PACKAGE_DIR_SUFFIX = $(shell echo $(OUTPUTDIRNAME) | sed 's/output//' | sed 's~^_open~/open~')
-PACKAGE_SSL_DECORATION = $(shell echo $(OUTPUTDIRNAME) | sed 's/output_openssl_0.9.8/ssl_098/' | sed 's/output_openssl_1.0.0/ssl_100/' | sed 's/output_openssl_1.1.0/ssl_110/')
+PACKAGE_SSL_DECORATION = $(shell echo $(OUTPUTDIRNAME) | sed 's/output_openssl_1.0.0/ssl_100/' | sed 's/output_openssl_1.1.0/ssl_110/')
 PACKAGE_DIR = $(TOP)/../Packages/$(BUILD_CONFIGURATION)$(PACKAGE_DIR_SUFFIX)
 
 # Selinux policy directories.

diff --git a/Unix/installbuilder/datafiles/ULinux.data b/Unix/installbuilder/datafiles/ULinux.data
@@ -12,9 +12,6 @@
 
 SSL_VERSION=`openssl version | awk '{print $2}'`
 case "$SSL_VERSION" in
-    0.9.8*)
-	SSL_FOUND=0.9.8
-        ;;
     1.0.*)
         SSL_FOUND=1.0.0
         ;;

diff --git a/Unix/scripts/installssllinks b/Unix/scripts/installssllinks
@@ -5,9 +5,6 @@ ATTEMPT_HMAC_LINK_CREATION=0
 verify_ssl_version() {
     SSL_VERSION=`openssl version | awk '{print $2}'`
     case "$SSL_VERSION" in
-        0.9.8*)
-            LIB_SUFFIX="0.9.8"
-            ;;
         1.0.*)
             LIB_SUFFIX="1.0.0"
             ATTEMPT_HMAC_LINK_CREATION=1
@@ -18,7 +15,7 @@ verify_ssl_version() {
             ;;
         *)
             echo "Error: OpenSSL version '${SSL_VERSION}' is not supported. Supported versions of OpenSSL are:" >&2
-            echo "    0.9.8*, 1.0.*, and 1.1.*." >&2
+            echo "    1.0.*, and 1.1.*." >&2
             exit 2
             ;;
     esac