11 files changed, 108 insertions, 47 deletions

diff --git a/.github/workflows/macos_test.yml b/.github/workflows/macos_test.yml
index 83a1b35..d7509d6 100644
--- a/.github/workflows/macos_test.yml
+++ b/.github/workflows/macos_test.yml
@@ -6,13 +6,12 @@ jobs:
   build-native:
     strategy:
       matrix:
-        os: [macos-12, macos-11]
-        compiler: [clang, gcc]
+        os: [macos-13, macos-12]
+        arch: [arm64, x86_64]
     runs-on: ${{ matrix.os }}
     continue-on-error: false
     env:
-      CC: ${{ matrix.compiler }}
-      ARCH: native
+      ARCH: ${{ matrix.arch }}
     name: ${{ matrix.compiler }} - ${{ matrix.os }}
     steps:
     - name: Install packages for macos
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7847830..b8863c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,6 +306,15 @@ if(HAVE_NETINET_IP_H)
         add_definitions(-DHAVE_NETINET_IP_H)
 endif()
 
+# This isn't ready for universal binaries yet, since we do conditional
+# compilation based on the architecture, but this makes cross compiling for a
+# single architecture work on macOS at least.
+#
+# Don't set CMAKE_OSX_ARCHITECTURES to more than a single value for now.
+if(APPLE)
+        set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}")
+endif()
+
 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(aarch64|arm64)")
         set(HOST_AARCH64 true)
 elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index bd59211..ffd68e5 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -36,8 +36,14 @@ else()
 endif()
 
 add_executable(nc ${NC_SRC})
-target_include_directories(nc PUBLIC ../../include)
-target_include_directories(nc PRIVATE . ./compat ../../include/compat)
+target_include_directories(nc
+        PRIVATE
+                .
+                ./compat
+                ../../include/compat
+        PUBLIC
+                ../../include
+                ${CMAKE_BINARY_DIR}/include)
 target_link_libraries(nc ${LIBTLS_LIBS})
 
 if(ENABLE_NC)
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 2dddb6e..43eebdf 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -8,9 +8,9 @@ set(
 
 check_function_exists(memmem HAVE_MEMMEM)
 if(HAVE_MEMMEM)
-        add_definitions(-DHAVE_MEMMEM)
+        add_definitions(-DHAVE_MEMMEM)
 else()
-        set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
+        set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
 endif()
 
 if(NOT "${OPENSSLDIR}" STREQUAL "")
@@ -20,8 +20,12 @@ else()
 endif()
 
 add_executable(ocspcheck ${OCSPCHECK_SRC})
-target_include_directories(ocspcheck PUBLIC ../../include)
-target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat)
+target_include_directories(ocspcheck
+        PRIVATE
+                ../../include/compat
+        PUBLIC
+                ../../include
+                ${CMAKE_BINARY_DIR}/include)
 target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
 
 if(ENABLE_LIBRESSL_INSTALL)
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index 437c0db..efea217 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -61,15 +61,20 @@ if(WIN32)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-        check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
-        if(NOT HAVE_CLOCK_GETTIME)
-                set(OPENSSL_SRC ${OPENSSL_SRC} compat/clock_gettime_osx.c)
-        endif()
+        check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
+        if(NOT HAVE_CLOCK_GETTIME)
+                        set(OPENSSL_SRC ${OPENSSL_SRC} compat/clock_gettime_osx.c)
+        endif()
 endif()
 
 add_executable(openssl ${OPENSSL_SRC})
-target_include_directories(openssl PUBLIC ../../include)
-target_include_directories(openssl PRIVATE . ../../include/compat)
+target_include_directories(openssl
+        PRIVATE
+                .
+                ../../include/compat
+        PUBLIC
+                ../../include
+                ${CMAKE_BINARY_DIR}/include)
 target_link_libraries(openssl ${OPENSSL_LIBS})
 
 if(ENABLE_LIBRESSL_INSTALL)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 707424c..84eb894 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -997,7 +997,8 @@ target_include_directories(crypto_obj
                 x509
                 ../include/compat
         PUBLIC
-                ../include)
+                ../include
+                ${CMAKE_BINARY_DIR}/include)
 
 if(HOST_AARCH64)
         target_include_directories(crypto_obj PRIVATE bn/arch/aarch64/)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 44ab86b..ca81ee8 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -4,7 +4,10 @@ if(ENABLE_LIBRESSL_INSTALL)
                 PATTERN "CMakeLists.txt" EXCLUDE
                 PATTERN "compat" EXCLUDE
                 PATTERN "pqueue.h" EXCLUDE
-                PATTERN "Makefile*" EXCLUDE)
+                PATTERN "Makefile*" EXCLUDE
+                PATTERN "arch" EXCLUDE)
+        install(FILES ${CMAKE_BINARY_DIR}/include/openssl/opensslconf.h
+                DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/openssl")
 endif(ENABLE_LIBRESSL_INSTALL)
 
 if(HOST_AARCH64)
@@ -28,4 +31,4 @@ elseif(HOST_SPARC64)
 elseif(HOST_X86_64)
         file(READ arch/amd64/opensslconf.h OPENSSLCONF)
 endif()
-file(WRITE openssl/opensslconf.h "${OPENSSLCONF}")
+file(WRITE ${CMAKE_BINARY_DIR}/include/openssl/opensslconf.h "${OPENSSLCONF}")
diff --git a/scripts/test b/scripts/test
index f1fdd83..97e316e 100755
--- a/scripts/test
+++ b/scripts/test
@@ -10,46 +10,77 @@ if type apt-get >/dev/null 2>&1; then
         sudo apt-get install -y cmake ninja-build
 fi
 
+# generate source tree
 ./autogen.sh
 
-if [ "x$ARCH" = "xnative" ]; then
+if [ "$ARCH" = "" ]; then
+        ARCH=`uname -m`
+fi
+
+# test macOS
+if [ `uname` = "Darwin" ]; then
         # test autotools
         ./configure
-        make -j 4 distcheck
 
         # make distribution
-        make dist
+        make -j 4 distcheck
+
+        # test cmake
         tar zxvf libressl-*.tar.gz
         cd libressl-*
-        mkdir build-static
-        mkdir build-shared
-
-        cd build-static
 
-        # test cmake and ninja
-        if [ `uname` = "Darwin" ]; then
-                cmake -DENABLE_ASM=${ENABLE_ASM} ..
+        (
+                mkdir build-static
+                cd build-static
+                cmake -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
                 make -j 4
-                make test
+                if [ "$ARCH" = "x86_64" ]; then
+                        make test
+                fi
+        )
 
-                cd ../build-shared
-                cmake -DBUILD_SHARED_LIBS=ON -DENABLE_ASM=${ENABLE_ASM} ..
+        (
+                mkdir build-shared
+                cd build-shared
+                cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
                 make -j 4
-                make test
-        else
+                if [ "$ARCH" = "x86_64" ]; then
+                        make test
+                fi
+        )
+
+# assuming Linux below
+elif [ "$ARCH" = "native" ]; then
+        # test autotools
+        ./configure
+
+        # make distribution
+        make -j 4 distcheck
+
+        tar zxvf libressl-*.tar.gz
+        cd libressl-*
+
+
+        # test cmake and ninja
+        (
+                mkdir build-static
+                cd build-static
                 cmake -GNinja -DENABLE_ASM=${ENABLE_ASM} ..
-                ninja -j 4
+                ninja
                 ninja test
+        )
 
-                cd ../build-shared
+        (
+                mkdir build-shared
+                cd build-shared
                 cmake -GNinja -DBUILD_SHARED_LIBS=ON -DENABLE_ASM=${ENABLE_ASM} ..
-                ninja -j 4
+                ninja
                 ninja test
-        fi
+        )
 
-elif [ "x$ARCH" = "xmingw32" -o "x$ARCH" = "xmingw64" ]; then
+elif [ "$ARCH" = "mingw32" -o "$ARCH" = "mingw64" ]; then
         CPU=i686
-        if [ "x$ARCH" = "xmingw64" ]; then
+        if [ "$ARCH" = "mingw64" ]; then
                 CPU=x86_64
         fi
 
@@ -75,10 +106,10 @@ elif [ "x$ARCH" = "xmingw32" -o "x$ARCH" = "xmingw64" ]; then
          ninja -j 4
         )
 
-elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then
+elif [ "$ARCH" = "arm32" -o "$ARCH" = "arm64" ]; then
         sudo apt-get install -y qemu-user-static binfmt-support
 
-        if [ "x$ARCH" = "xarm32" ]; then
+        if [ "$ARCH" = "arm32" ]; then
                 sudo apt-get install -y g++-arm-linux-gnueabihf
                 sudo ln -sf /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib/
                 ./configure --host=arm-linux-gnueabihf
@@ -92,10 +123,10 @@ elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then
 
         file apps/openssl/.libs/openssl
 
-elif [ "x$ARCH" = "xmips32" -o "x$ARCH" = "xmips64" ]; then
+elif [ "$ARCH" = "mips32" -o "$ARCH" = "mips64" ]; then
         sudo apt-get install -y qemu-user-static binfmt-support
 
-        if [ "x$ARCH" = "xmips32" ]; then
+        if [ "$ARCH" = "mips32" ]; then
                 sudo apt-get install -y g++-mips-linux-gnu
                 sudo ln -sf /usr/mipsel-linux-gnu/lib/ld.so.1 /lib/
                 ./configure --host=mipsel-linux-gnu
@@ -109,7 +140,7 @@ elif [ "x$ARCH" = "xmips32" -o "x$ARCH" = "xmips64" ]; then
 
         file apps/openssl/.libs/openssl
 
-elif [ "x$ARCH" = "xandroid" ]; then
+elif [ "$ARCH" = "android" ]; then
         export TC_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake
 
         # set target API level and architecture
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index f5d52f7..88e7bbd 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -69,7 +69,8 @@ target_include_directories(ssl_obj
                 ../crypto/bio
                 ../include/compat
         PUBLIC
-                ../include)
+                ../include
+                ${CMAKE_BINARY_DIR}/include)
 
 add_library(bs_obj OBJECT ${BS_SRC})
 target_include_directories(bs_obj
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 36c68a9..9edb613 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,6 +13,7 @@ include_directories(
         ../apps/openssl
         ../apps/openssl/compat
         ../include
+        ${CMAKE_BINARY_DIR}/include
         ../include/compat
 )
 
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 62dde63..5bc6208 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -45,7 +45,8 @@ target_include_directories(tls_obj
                 .
                 ../include/compat
         PUBLIC
-                ../include)
+                ../include
+                ${CMAKE_BINARY_DIR}/include)
 
 add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj>
         $<TARGET_OBJECTS:crypto_obj> empty.c)