diff options
| author | Jack Lloyd <[email protected]> | 2019-10-25 21:33:13 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-10-25 21:33:13 -0400 |
| commit | dcb621e23a8ff8f1cb24adc681807a52dc6a49b3 (patch) | |
| tree | 35af73aae0f45e30f3113b34ae769ae089ead30d | |
| parent | 1ecfa4052e5730f8addf460b20741ab836e9476c (diff) | |
| parent | 0e80feed7f46e1bc9d600c20634700f9109babb7 (diff) | |
Merge GH #2183 Update BoGo shim
| -rw-r--r-- | src/bogo_shim/bogo_shim.cpp | 1 | ||||
| -rw-r--r-- | src/bogo_shim/config.json | 4 | ||||
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/bogo_shim/bogo_shim.cpp b/src/bogo_shim/bogo_shim.cpp index 16dc71fd9..5a9c36076 100644 --- a/src/bogo_shim/bogo_shim.cpp +++ b/src/bogo_shim/bogo_shim.cpp @@ -576,6 +576,7 @@ std::unique_ptr<Shim_Arguments> parse_options(char* argv[]) "expect-ticket-supports-early-data", //"expect-tls13-downgrade", "expect-verify-result", + "expect-no-hrr", //"export-traffic-secrets", "fail-cert-callback", //"fail-ddos-callback", diff --git a/src/bogo_shim/config.json b/src/bogo_shim/config.json index ee488109f..ce4b28352 100644 --- a/src/bogo_shim/config.json +++ b/src/bogo_shim/config.json @@ -22,6 +22,7 @@ "DelegatedCredentials*": "No TLS 1.3", "ExportTrafficSecrets-*": "No TLS 1.3", "IgnoreClientVersionOrder": "No TLS 1.3", + "Resume-Server-OmitPSKsOnSecondClientHello": "No TLS 1.3", "DuplicateCertCompressionExt*": "No support for 1.3 cert compression extension", @@ -43,6 +44,7 @@ "UnsolicitedCertificateExtensions-TLS*": "No support for SCT", "*NULL-SHA*": "No support for NULL ciphers", + "*WITH_NULL*": "No support for NULL ciphers", "*GREASE*": "No support for GREASE", "QUICTransportParams*": "No support for QUIC", "*ChannelID*": "No support for ChannelID", @@ -50,6 +52,7 @@ "ClientHelloPadding": "No support for client hello padding extension", "TLSUnique*": "Not supported", "*CECPQ2*": "Not implemented", + "PQExperimentSignal*": "Not implemented", "*P-224*": "P-224 not supported in TLS", "*V2ClientHello*": "No support for SSLv2 client hellos", "*Ed25519*": "Ed25519 not implemented in TLS", @@ -60,6 +63,7 @@ "Peek-*": "No peek API", "*OldCallback*": "BoringSSL specific API test", + "*Renegotiate-Client-Explicit*": "BoringSSL specific API test", "CBCRecordSplittingPartialWrite*": "BoringSSL specific API test", "TicketCallback*": "BoringSSL specific API test", "Server-DDoS*": "BoringSSL specific API test", diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index ff9416b5f..b4cbc15cc 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -65,7 +65,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update sudo apt-get install softhsm2 trousers libtspi-dev lcov python-coverage libboost-all-dev golang-1.10 gdb pip install --user codecov==2.0.10 - git clone --depth 1 --branch runner-changes https://github.com/randombit/boringssl.git + git clone --depth 1 --branch runner-changes-golang1.10 https://github.com/randombit/boringssl.git sudo chgrp -R "$(id -g)" /var/lib/softhsm/ /etc/softhsm sudo mkdir /var/lib/softhsm/tokens |