mirror of https://github.com/ctz/rustls
Take newer bogo for go1.14
Another minor go version, another set of breakage.
This commit is contained in:
parent
bee4c891c1
commit
278009aa58
|
@ -1,2 +1,3 @@
|
|||
runner.tar.gz
|
||||
testresult.tar.gz
|
||||
bogo/
|
||||
|
|
|
@ -3,13 +3,17 @@
|
|||
set -e
|
||||
|
||||
# a known-good commit
|
||||
COMMIT=8b60cde1ad8e25d99f9f83fdab9b3542a66217eb
|
||||
COMMIT=47a6f5b4bf4d7acd8d5f7d43cb9c94335cec1c60
|
||||
|
||||
rm -f runner.tar.gz
|
||||
rm -f runner.tar.gz testresult.tar.gz
|
||||
wget https://boringssl.googlesource.com/boringssl/+archive/$COMMIT/ssl/test/runner.tar.gz
|
||||
wget https://boringssl.googlesource.com/boringssl/+archive/$COMMIT/util/testresult.tar.gz
|
||||
mkdir -p bogo
|
||||
cd bogo/
|
||||
mkdir -p testresult
|
||||
tar -xzf ../runner.tar.gz
|
||||
( cd testresult && tar -xzf ../../testresult.tar.gz )
|
||||
patch -p1 < ../patches/testerrormap.diff
|
||||
patch -p1 < ../patches/go-1.13-breakage.diff
|
||||
patch -p1 < ../patches/vendor.diff
|
||||
go test -c
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
diff -u bogo-orig/chacha20_poly1305.go bogo/chacha20_poly1305.go
|
||||
--- bogo-orig/chacha20_poly1305.go 2020-04-11 11:09:43.000000000 +0100
|
||||
+++ bogo/chacha20_poly1305.go 2020-04-11 11:10:59.526200057 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
|
||||
- "boringssl.googlesource.com/boringssl/ssl/test/runner/poly1305"
|
||||
+ "./poly1305"
|
||||
)
|
||||
|
||||
// See RFC 7539.
|
||||
diff -u bogo-orig/key_agreement.go bogo/key_agreement.go
|
||||
--- bogo-orig/key_agreement.go 2020-04-11 11:09:43.000000000 +0100
|
||||
+++ bogo/key_agreement.go 2020-04-11 11:10:38.096679513 +0100
|
||||
@@ -17,8 +17,8 @@
|
||||
"io"
|
||||
"math/big"
|
||||
|
||||
- "boringssl.googlesource.com/boringssl/ssl/test/runner/curve25519"
|
||||
- "boringssl.googlesource.com/boringssl/ssl/test/runner/hrss"
|
||||
+ "./curve25519"
|
||||
+ "./hrss"
|
||||
)
|
||||
|
||||
type keyType int
|
||||
diff -u bogo-orig/runner.go bogo/runner.go
|
||||
--- bogo-orig/runner.go 2020-04-11 11:09:43.000000000 +0100
|
||||
+++ bogo/runner.go 2020-04-11 11:11:50.662973209 +0100
|
||||
@@ -46,7 +46,7 @@
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
- "boringssl.googlesource.com/boringssl/util/testresult"
|
||||
+ "./testresult"
|
||||
)
|
||||
|
||||
var (
|
Loading…
Reference in New Issue