diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-04-09 21:12:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-09 21:12:42 +0200 |
| commit | 944f5b5c7c3fc35415b956c9dc4f0a478de3809f (patch) | |
| tree | 5df15c6c14b237e614a6cc9a20e4263ac9b4549d | |
| parent | 0b91d71b9cd7e9641287433ea0d0fed3982edb23 (diff) | |
| parent | c260174c5bfcdf7cc3bd6db0f2bd51cf7b1f8648 (diff) | |
| download | vyos-build-944f5b5c7c3fc35415b956c9dc4f0a478de3809f.tar.gz vyos-build-944f5b5c7c3fc35415b956c9dc4f0a478de3809f.zip | |
Merge pull request #334 from chenxiaolong/eapol_tls_1.0_regression
T5151: hostap: Reintroduce Debian's allow-legacy-renegotiation.patch
| -rw-r--r-- | packages/hostap/Jenkinsfile | 2 | ||||
| -rwxr-xr-x | packages/hostap/build.sh | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile index 1aeb4521..70c0e71b 100644 --- a/packages/hostap/Jenkinsfile +++ b/packages/hostap/Jenkinsfile @@ -21,7 +21,7 @@ def pkgList = [ ['name': 'wpa', - 'scmCommit': 'debian/2%2.10-10', + 'scmCommit': 'debian/2%2.10-12', 'scmUrl': 'https://salsa.debian.org/debian/wpa', 'buildCmd': '/bin/true'], ['name': 'hostap', diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh index c66bda3d..e69236dd 100755 --- a/packages/hostap/build.sh +++ b/packages/hostap/build.sh @@ -16,9 +16,12 @@ fi echo "I: Copy Debian build instructions" cp -a ${SRC_DEB}/debian ${SRC} -# Preserve Debian's default of allowing TLSv1.0 for compatibility -find ${SRC}/debian/patches -mindepth 1 ! -name allow-tlsv1.patch -delete -echo 'allow-tlsv1.patch' > ${SRC}/debian/patches/series +# Preserve Debian's default of allowing TLSv1.0 and legacy renegotiation for +# compatibility with networks that use legacy crypto +cat > ${SRC}/debian/patches/series << EOF +allow-tlsv1.patch +allow-legacy-renegotiation.patch +EOF # Build Debian package cd ${SRC} |