mirror of git://anongit.mindrot.org/openssh.git
Github testing support for BoringSSL
This commit is contained in:
parent
9a97cd1064
commit
021ea5c286
|
@ -139,6 +139,10 @@ case "$config" in
|
||||||
CONFIGFLAGS="--with-pam"
|
CONFIGFLAGS="--with-pam"
|
||||||
SSHD_CONFOPTS="UsePam yes"
|
SSHD_CONFOPTS="UsePam yes"
|
||||||
;;
|
;;
|
||||||
|
boringssl)
|
||||||
|
CONFIGFLAGS="--disable-pkcs11"
|
||||||
|
LIBCRYPTOFLAGS="--with-ssl-dir=/opt/boringssl --with-rpath=-Wl,-rpath,"
|
||||||
|
;;
|
||||||
libressl-*)
|
libressl-*)
|
||||||
LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl --with-rpath=-Wl,-rpath,"
|
LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl --with-rpath=-Wl,-rpath,"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -124,6 +124,10 @@ for TARGET in $TARGETS; do
|
||||||
esac
|
esac
|
||||||
PACKAGES="${PACKAGES} putty-tools"
|
PACKAGES="${PACKAGES} putty-tools"
|
||||||
;;
|
;;
|
||||||
|
boringssl)
|
||||||
|
INSTALL_BORINGSSL=1
|
||||||
|
PACKAGES="${PACKAGES} cmake ninja-build"
|
||||||
|
;;
|
||||||
valgrind*)
|
valgrind*)
|
||||||
PACKAGES="$PACKAGES valgrind"
|
PACKAGES="$PACKAGES valgrind"
|
||||||
;;
|
;;
|
||||||
|
@ -199,3 +203,12 @@ if [ ! -z "${INSTALL_LIBRESSL}" ]; then
|
||||||
./configure --prefix=/opt/libressl && make -j2 && sudo make install)
|
./configure --prefix=/opt/libressl && make -j2 && sudo make install)
|
||||||
fi
|
fi
|
||||||
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
|
||||||
|
|
|
@ -46,6 +46,7 @@ jobs:
|
||||||
- { target: ubuntu-20.04, config: hardenedmalloc }
|
- { target: ubuntu-20.04, config: hardenedmalloc }
|
||||||
- { target: ubuntu-20.04, config: tcmalloc }
|
- { target: ubuntu-20.04, config: tcmalloc }
|
||||||
- { target: ubuntu-20.04, config: musl }
|
- { target: ubuntu-20.04, config: musl }
|
||||||
|
- { target: ubuntu-latest, config: boringssl }
|
||||||
- { target: ubuntu-latest, config: libressl-master }
|
- { target: ubuntu-latest, config: libressl-master }
|
||||||
- { target: ubuntu-latest, config: libressl-3.2.6 }
|
- { target: ubuntu-latest, config: libressl-3.2.6 }
|
||||||
- { target: ubuntu-latest, config: libressl-3.3.6 }
|
- { target: ubuntu-latest, config: libressl-3.3.6 }
|
||||||
|
|
Loading…
Reference in New Issue