aboutsummaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo@golang.org>2019-11-19 15:20:53 -0500
committerFilippo Valsorda <filippo@golang.org>2019-11-19 15:31:40 -0500
commit62ce702c77915c6fddc2fcbd95265df4b2f17a08 (patch)
tree87f1ce85fc3be1123ed5fd659fbcb75c362b2a98 /api
parente8f14494a08bde693818a31f38310a82e4e63582 (diff)
parentec732632c2c26dadf424462ac42ebd32dce3ee88 (diff)
downloadgo-62ce702c77915c6fddc2fcbd95265df4b2f17a08.tar.gz
go-62ce702c77915c6fddc2fcbd95265df4b2f17a08.zip
[dev.boringcrypto] all: merge master into dev.boringcrypto
Signing-side signature algorithm selection moved to selectSignatureScheme, so add FIPS logic there. Change-Id: I827e7296d01ecfd36072e2139e74603ef42c6b24
Diffstat (limited to 'api')
-rw-r--r--api/except.txt1
-rw-r--r--api/next.txt5
2 files changed, 6 insertions, 0 deletions
diff --git a/api/except.txt b/api/except.txt
index 2a1287ce90..6316401897 100644
--- a/api/except.txt
+++ b/api/except.txt
@@ -459,3 +459,4 @@ pkg syscall (freebsd-arm-cgo), type Statfs_t struct, Mntfromname [88]int8
pkg syscall (freebsd-arm-cgo), type Statfs_t struct, Mntonname [88]int8
pkg text/scanner, const GoTokens = 1012
pkg unicode, const Version = "10.0.0"
+pkg unicode, const Version = "11.0.0"
diff --git a/api/next.txt b/api/next.txt
index e69de29bb2..816aadf8ea 100644
--- a/api/next.txt
+++ b/api/next.txt
@@ -0,0 +1,5 @@
+pkg unicode, const Version = "12.0.0"
+pkg unicode, var Elymaic *RangeTable
+pkg unicode, var Nandinagari *RangeTable
+pkg unicode, var Nyiakeng_Puachue_Hmong *RangeTable
+pkg unicode, var Wancho *RangeTable