diff options
author | Damien Miller <djm@mindrot.org> | 2023-03-24 15:02:52 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2023-03-24 15:39:48 +1100 |
commit | 021ea5c2860f133f44790970968e0e73208b3a87 (patch) | |
tree | 96f241670e17ae3af1e3f682b5727f978c6a8885 | |
parent | 9a97cd106466a2a9bda2bfaa4c48c4f1b2cc9c1b (diff) | |
download | openssh-git-021ea5c2860f133f44790970968e0e73208b3a87.tar.gz |
Github testing support for BoringSSL
-rwxr-xr-x | .github/configs | 4 | ||||
-rwxr-xr-x | .github/setup_ci.sh | 13 | ||||
-rw-r--r-- | .github/workflows/c-cpp.yml | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/.github/configs b/.github/configs index 8f21fc54..eb91732c 100755 --- a/.github/configs +++ b/.github/configs @@ -139,6 +139,10 @@ case "$config" in CONFIGFLAGS="--with-pam" SSHD_CONFOPTS="UsePam yes" ;; + boringssl) + CONFIGFLAGS="--disable-pkcs11" + LIBCRYPTOFLAGS="--with-ssl-dir=/opt/boringssl --with-rpath=-Wl,-rpath," + ;; libressl-*) LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl --with-rpath=-Wl,-rpath," ;; diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh index 691c70dd..489114be 100755 --- a/.github/setup_ci.sh +++ b/.github/setup_ci.sh @@ -124,6 +124,10 @@ for TARGET in $TARGETS; do esac PACKAGES="${PACKAGES} putty-tools" ;; + boringssl) + INSTALL_BORINGSSL=1 + PACKAGES="${PACKAGES} cmake ninja-build" + ;; valgrind*) PACKAGES="$PACKAGES valgrind" ;; @@ -199,3 +203,12 @@ if [ ! -z "${INSTALL_LIBRESSL}" ]; then ./configure --prefix=/opt/libressl && make -j2 && sudo make install) fi fi + +if [ ! -z "${INSTALL_BORINGSSL}" ]; then + (cd ${HOME} && git clone https://boringssl.googlesource.com/boringssl && + cd ${HOME}/boringssl && mkdir build && cd build && + cmake -GNinja -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. && ninja && + mkdir -p /opt/boringssl/lib && + cp ${HOME}/boringssl/build/crypto/libcrypto.a /opt/boringssl/lib && + cp -r ${HOME}/boringssl/include /opt/boringssl) +fi diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index d299a324..fbd62f83 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -46,6 +46,7 @@ jobs: - { target: ubuntu-20.04, config: hardenedmalloc } - { target: ubuntu-20.04, config: tcmalloc } - { target: ubuntu-20.04, config: musl } + - { target: ubuntu-latest, config: boringssl } - { target: ubuntu-latest, config: libressl-master } - { target: ubuntu-latest, config: libressl-3.2.6 } - { target: ubuntu-latest, config: libressl-3.3.6 } |