From 2e7ed50a5a520c14a1346e61919614bc86a2c16a Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 31 Aug 2022 22:20:34 +0000
Subject: [PATCH] Update macosx OpenSSL to 3.0.5

---
 macosx/openssl.modules | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/macosx/openssl.modules b/macosx/openssl.modules
index 26000877a..2e7a55a1f 100644
--- a/macosx/openssl.modules
+++ b/macosx/openssl.modules
@@ -16,14 +16,15 @@
 
     <!-- MODULES -->
 
-    <autotools id="openssl" autogen-sh="Configure" autogenargs="shared enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers"
+<!-- no-asm added to support building OpenSSL 3.0 on HighSierra. When upgrading to newer build system, remove it. -->
+    <autotools id="openssl" autogen-sh="Configure" autogenargs="shared no-asm enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers"
         autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s
             --openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
             makeargs="depend all"
         makeinstallargs="INSTALL_PREFIX='$(DESTDIR)' install_dev"
         supports-parallel-builds="no"
         supports-non-srcdir-builds="no">
-        <branch repo="openssl" version="1.1.1k" module="openssl-1.1.1k.tar.gz"/>
+        <branch repo="openssl" version="3.0.5" module="openssl-3.0.5.tar.gz"/>
     </autotools>
 
     <autotools id="nmap" supports-non-srcdir-builds="no"
@@ -31,6 +32,7 @@
 --without-zenmap --without-ncat --without-ndiff --without-nping"
         makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"'
 	makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
+	makeclean="false"
     >
         <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>
@@ -43,6 +45,7 @@
 --without-zenmap --without-ndiff --without-nping"
         makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
         makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
+	makeclean="false"
     >
         <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>
@@ -55,30 +58,7 @@
 --without-zenmap --without-ncat --without-ndiff"
         makeargs='build-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
         makeinstallargs='install-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
-    >
-        <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
-        <dependencies>
-            <dep package="openssl" />
-        </dependencies>
-    </autotools>
-
-    <autotools id="nmap" supports-non-srcdir-builds="no"
-       autogen-sh="configure" autogenargs="--with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
---without-zenmap --without-ncat --without-ndiff --without-nping"
-        makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"'
-	makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
-    >
-        <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
-        <dependencies>
-            <dep package="openssl" />
-        </dependencies>
-    </autotools>
- 
-    <autotools id="ncat" supports-non-srcdir-builds="no"
-       autogen-sh="configure" autogenargs="--with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
---without-zenmap --without-ndiff --without-nping"
-        makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
-        makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
+	makeclean="false"
     >
         <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>