OpenSSL v3 support for DSC (#911)

* build dsc with openssl v3

* Add option

* Folder update

---------

Co-authored-by: Narine Mossikyan <narinem@microsoft.com>

Author: kkarmakarMS

Makefile

@@ -61,6 +61,12 @@ else
 	$(MAKE) dsc110
 	$(MAKE) dsckit110
  endif
+ ifeq ($(BUILD_SSL_300),1)
+	rm -rf omi-1.0.8/output_openssl_3.0.0/lib/libdsccore.so
+	$(MAKE) omi300
+	$(MAKE) dsc300
+	$(MAKE) dsckit300
+ endif
 
 endif
 
@@ -95,6 +101,16 @@ endif
 	-mkdir -p release; \
 	cp omi-1.0.8/output_openssl_1.1.0/release/*.{rpm,deb} output/release/*.{rpm,deb} release/
 
+ifeq ($(BUILD_OMS),BUILD_OMS)
+dsckit300: nx nxOMSPerfCounter nxOMSSyslog nxOMSKeyMgmt nxOMSPlugin nxOMSCustomLog nxOMSSudoCustomLog nxFileInventory nxOMSGenerateInventoryMof nxOMSAgentNPMConfig nxOMSAutomationWorker nxOMSAuditdPlugin
+else
+dsckit300: nx nxNetworking nxComputerManagement nxMySQL
+endif
+	$(MAKE) -C $(INSTALLBUILDER_DIR) SSL_VERSION=300 BUILD_RPM=$(BUILD_RPM) BUILD_DPKG=$(BUILD_DPKG) BUILD_OMS_VAL=$(BUILD_OMS_VAL)
+
+	-mkdir -p release; \
+	cp omi-1.0.8/output_openssl_3.0.0/release/*.{rpm,deb} output/release/*.{rpm,deb} release/
+
 dsc098: lcm098 providers
 	mkdir -p intermediate/Scripts
 	mkdir -p intermediate/Scripts/python3
@@ -226,6 +242,49 @@ dsc110: lcm110 providers
 	done
 	if [ -f ../dsc.version ]; then cp -f ../dsc.version build/dsc.version; else cp -f build/Makefile.version build/dsc.version; fi
 
+dsc300: lcm300 providers
+	mkdir -p intermediate/Scripts
+	mkdir -p intermediate/Scripts/python3
+	mkdir -p intermediate/Modules
+	.  omi-1.0.8/output_openssl_3.0.0/config.mak; \
+	for f in LCM/scripts/*.py LCM/scripts/*.sh Providers/Scripts/*.py Providers/Scripts/*.sh; do \
+	  cat $$f | \
+	  sed "s@<CONFIG_BINDIR>@$$CONFIG_BINDIR@" | \
+	  sed "s@<CONFIG_LIBDIR>@$$CONFIG_LIBDIR@" | \
+	  sed "s@<CONFIG_LOCALSTATEDIR>@$$CONFIG_LOCALSTATEDIR@" | \
+	  sed "s@<CONFIG_SYSCONFDIR>@$$CONFIG_SYSCONFDIR@" | \
+	  sed "s@<CONFIG_SYSCONFDIR_DSC>@$(CONFIG_SYSCONFDIR_DSC)@" | \
+	  sed "s@<OAAS_CERTPATH>@$(OAAS_CERTPATH)@" | \
+	  sed "s@<OAAS_KEYPATH>@$(OAAS_KEYPATH)@" | \
+	  sed "s@<OAAS_THUMBPRINT>@$(OAAS_THUMBPRINT)@" | \
+	  sed "s@<OMI_LIB_SCRIPTS>@$$CONFIG_LIBDIR/Scripts@" | \
+	  sed "s@<PYTHON_PID_DIR>@$(PYTHON_PID_DIR)@" | \
+	  sed "s@<DSC_NAMESPACE>@$(DSC_NAMESPACE)@" | \
+	  sed "s@<DSC_SCRIPT_PATH>@$(DSC_SCRIPT_PATH)@" | \
+	  sed "s@<DSC_HOST_BASE_PATH>@$(DSC_HOST_BASE_PATH)@" | \
+	  sed "s@<DSC_MODULES_PATH>@$(DSC_MODULES_PATH)@" > intermediate/Scripts/`basename $$f`; \
+	  chmod a+x intermediate/Scripts/`basename $$f`; \
+	done
+
+	for f in LCM/scripts/python3/*.py LCM/scripts/python3/*.sh; do \
+	  cat $$f | \
+	  sed "s@<CONFIG_BINDIR>@$$CONFIG_BINDIR@" | \
+	  sed "s@<CONFIG_LIBDIR>@$$CONFIG_LIBDIR@" | \
+	  sed "s@<CONFIG_LOCALSTATEDIR>@$$CONFIG_LOCALSTATEDIR@" | \
+	  sed "s@<CONFIG_SYSCONFDIR>@$$CONFIG_SYSCONFDIR@" | \
+	  sed "s@<CONFIG_SYSCONFDIR_DSC>@$(CONFIG_SYSCONFDIR_DSC)@" | \
+	  sed "s@<OAAS_CERTPATH>@$(OAAS_CERTPATH)@" | \
+	  sed "s@<OAAS_KEYPATH>@$(OAAS_KEYPATH)@" | \
+	  sed "s@<OAAS_THUMBPRINT>@$(OAAS_THUMBPRINT)@" | \
+	  sed "s@<OMI_LIB_SCRIPTS>@$$CONFIG_LIBDIR/Scripts@" | \
+	  sed "s@<PYTHON_PID_DIR>@$(PYTHON_PID_DIR)@" | \
+	  sed "s@<DSC_NAMESPACE>@$(DSC_NAMESPACE)@" | \
+	  sed "s@<DSC_SCRIPT_PATH>@$(DSC_SCRIPT_PATH)@" | \
+	  sed "s@<DSC_HOST_BASE_PATH>@$(DSC_HOST_BASE_PATH)@" | \
+	  sed "s@<DSC_MODULES_PATH>@$(DSC_MODULES_PATH)@" > intermediate/Scripts/python3/`basename $$f`; \
+	  chmod a+x intermediate/Scripts/python3/`basename $$f`; \
+	done
+	if [ -f ../dsc.version ]; then cp -f ../dsc.version build/dsc.version; else cp -f build/Makefile.version build/dsc.version; fi
 
 omi098:
 	$(MAKE) configureomi098
@@ -248,6 +307,13 @@ omi110:
 	$(MAKE) -C omi-1.0.8
 	$(MAKE) -C omi-1.0.8/installbuilder SSL_VERSION=110 BUILD_RPM=$(BUILD_RPM) BUILD_DPKG=$(BUILD_DPKG) SSL_BUILD=1.1.0
 
+omi300:
+	$(MAKE) configureomi300
+	rm -rf omi-1.0.8/output
+	ln -s output_openssl_3.0.0 omi-1.0.8/output
+	$(MAKE) -C omi-1.0.8
+	$(MAKE) -C omi-1.0.8/installbuilder SSL_VERSION=300 BUILD_RPM=$(BUILD_RPM) BUILD_DPKG=$(BUILD_DPKG) SSL_BUILD=3.0.0
+
 configureomi098:
 	(cd omi-1.0.8; ./configure $(DEBUG_FLAGS) --enable-preexec --prefix=/opt/omi --outputdirname=output_openssl_0.9.8 --localstatedir=/var/opt/omi --sysconfdir=/etc/opt/omi/conf --certsdir=/etc/opt/omi/ssl --opensslcflags="$(openssl098_cflags)" --openssllibs="-L$(current_dir)/ext/curl/current_platform/lib $(openssl098_libs)" --openssllibdir="$(openssl098_libdir)")
 
@@ -257,6 +323,9 @@ configureomi100:
 configureomi110:
 	(cd omi-1.0.8; ./configure $(DEBUG_FLAGS) --enable-preexec --prefix=/opt/omi --outputdirname=output_openssl_1.1.0 --localstatedir=/var/opt/omi --sysconfdir=/etc/opt/omi/conf --certsdir=/etc/opt/omi/ssl --opensslcflags="$(openssl110_cflags)" --openssllibs="-L$(current_dir)/ext/curl/current_platform/lib $(openssl110_libs)" --openssllibdir="$(openssl110_libdir)")
 
+configureomi300:
+	(cd omi-1.0.8; ./configure $(DEBUG_FLAGS) --enable-preexec --prefix=/opt/omi --outputdirname=output_openssl_3.0.0 --localstatedir=/var/opt/omi --sysconfdir=/etc/opt/omi/conf --certsdir=/etc/opt/omi/ssl --opensslcflags="$(openssl300_cflags)" --openssllibs="-L$(current_dir)/ext/curl/current_platform/lib $(openssl300_libs)" --openssllibdir="$(openssl300_libdir)")
+
 lcm098:
 	$(MAKE) -C LCM
 
@@ -266,6 +335,9 @@ lcm100:
 lcm110:
 	$(MAKE) -C LCM
 
+lcm300:
+	$(MAKE) -C LCM
+
 providers:
 	$(MAKE) -C Providers
 
@@ -684,6 +756,7 @@ distclean: clean
 	rm -rf omi-1.0.8/output_openssl_0.9.8
 	rm -rf omi-1.0.8/output_openssl_1.0.0
 	rm -rf omi-1.0.8/output_openssl_1.1.0
+	rm -rf omi-1.0.8/output_openssl_3.0.0
 
 clean:
 ifeq ($(BUILD_LOCAL),1)

configure

@@ -5,6 +5,7 @@ BUILD_DPKG=1
 BUILD_SSL_098=1
 BUILD_SSL_100=1
 BUILD_SSL_110=1
+BUILD_SSL_300=1
 BUILD_SSL_SYSTEM=0
 BUILD_DEBUG=0
 BUILD_OMS=
@@ -59,6 +60,9 @@ do
 	--no-ssl-110)
 	    BUILD_SSL_110=0
 	    ;;
+    --no-ssl-300)
+	    BUILD_SSL_300=0
+	    ;;
 	--oms)
 	    if [ "$BUILD_LOCAL" = "1" ]; then
 		echo "Error: options --oms and --local conflict."
@@ -100,6 +104,7 @@ OPTIONS:
     --no-ssl-098                Do not build for OpenSSL 0.9.8x
     --no-ssl-100                Do not build for OpenSSL 1.0.x
 	--no-ssl-110                Do not build for OpenSSL 1.1.x
+    --no-ssl-300                Do not build for OpenSSL 3.0.x
 
     --local                     Build without packages and for the OpenSSL installed to the system.
 EOF
@@ -109,7 +114,7 @@ fi
 
 pkgconfig=`which pkg-config`
 
-if [ -d "/usr/local_ssl_0.9.8" ] || [ -d "/usr/local_ssl_1.0.0" ] || [ -d "/usr/local_ssl_1.1.0" ]; then
+if [ -d "/usr/local_ssl_0.9.8" ] || [ -d "/usr/local_ssl_1.0.0" ] || [ -d "/usr/local_ssl_1.1.0" ] || [ -d "/usr/local_ssl_3.0.0" ]; then
     if [ -d "/usr/local_ssl_0.9.8" ]; then
         if [ "`uname -m`" == "x86_64" ]; then
             openssl098_libdir=/usr/local_ssl_0.9.8/lib
@@ -144,6 +149,16 @@ if [ -d "/usr/local_ssl_0.9.8" ] || [ -d "/usr/local_ssl_1.0.0" ] || [ -d "/usr/
         echo -e "\e[33mYellow SSL version 1.1.0 is not found at path /usr/local_ssl_1.1.0. Skipping build for SSL 1.1.0.\e[0m"
         BUILD_SSL_110=0
     fi
+    if [ -d "/usr/local_ssl_3.0.0" ]; then
+        if [ "`uname -m`" == "x86_64" ]; then
+            openssl300_libdir=/usr/local_ssl_3.0.0/lib64
+        fi
+        openssl300_cflags=`PKG_CONFIG_PATH=$openssl300_libdir/pkgconfig $pkgconfig --cflags openssl`
+        openssl300_libs=`PKG_CONFIG_PATH=$openssl300_libdir/pkgconfig $pkgconfig --libs openssl`
+    else
+        echo -e "\e[33mYellow SSL version 3.0.0 is not found at path /usr/local_ssl_3.0.0. Skipping build for SSL 3.0.0.\e[0m"
+        BUILD_SSL_300=0
+    fi
 fi
 
 cat <<EOF > config.mak
@@ -152,6 +167,7 @@ BUILD_DPKG=$BUILD_DPKG
 BUILD_SSL_098=$BUILD_SSL_098
 BUILD_SSL_100=$BUILD_SSL_100
 BUILD_SSL_110=$BUILD_SSL_110
+BUILD_SSL_300=$BUILD_SSL_300
 BUILD_LOCAL=$BUILD_LOCAL
 BUILD_OMS=$BUILD_OMS
 DSC_MODULES_PATH=$DSC_MODULES_PATH
@@ -172,6 +188,9 @@ openssl100_libdir=$openssl100_libdir
 openssl110_cflags=$openssl110_cflags
 openssl110_libs=$openssl110_libs
 openssl110_libdir=$openssl110_libdir
+openssl300_cflags=$openssl300_cflags
+openssl300_libs=$openssl300_libs
+openssl300_libdir=$openssl300_libdir
 
 EOF