Skip to content

Commit 92b40b6

Browse files
estespestesp
authored
Merge pull request #3988 from thaJeztah/1.2_bump_golang_1.12.16
[release/1.2] Update Golang 1.12.16, x/crypto (CVE-2020-0601, CVE-2020-7919)
2 parents 7276974 + 1bc2590 commit 92b40b6

22 files changed

Lines changed: 102 additions & 3006 deletions

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ environment:
1313
GOPATH: C:\gopath
1414
CGO_ENABLED: 1
1515
matrix:
16-
- GO_VERSION: 1.12.15
16+
- GO_VERSION: 1.12.16
1717

1818
before_build:
1919
- choco install -y mingw --version 5.3.0

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
language: go
88

99
go:
10-
- "1.12.15"
10+
- "1.12.16"
1111
os:
1212
- "linux"
1313
# TODO ppc64le is currently timing out on travis; see https://github.com/containerd/containerd/pull/2896

‎contrib/Dockerfile.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# 3.) $ make binaries install test
77
#
88

9-
ARG GOLANG_VERSION=1.12.15
9+
ARG GOLANG_VERSION=1.12.16
1010

1111
FROM golang:${GOLANG_VERSION} AS golang-base
1212
RUN mkdir -p /go/src/github.com/containerd/containerd

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ github.com/tchap/go-patricia v2.2.6
6868
github.com/xeipuuv/gojsonpointer 4e3ac2762d5f479393488629ee9370b50873b3a6
6969
github.com/xeipuuv/gojsonreference bd5ef7bd5415a7ac448318e64f11a24cd21e594b
7070
github.com/xeipuuv/gojsonschema 1d523034197ff1f222f6429836dd36a2457a1874
71-
golang.org/x/crypto 49796115aa4b964c318aad4f3084fdb41e9aa067
71+
golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
7272
golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
7373
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
7474
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4

‎vendor/golang.org/x/crypto/curve25519/const_amd64.h‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎vendor/golang.org/x/crypto/curve25519/const_amd64.s‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎vendor/golang.org/x/crypto/curve25519/cswap_amd64.s‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)