Skip to content

Commit 8366042

Browse files
estespestesp
authored
Merge pull request #3989 from thaJeztah/1.3_bump_golang_1.12.16
[release/1.3] Update Golang 1.12.16, x/crypto (CVE-2020-0601, CVE-2020-7919)
2 parents 9cf1523 + 14d166c commit 8366042

17 files changed

Lines changed: 12 additions & 2947 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
@@ -10,7 +10,7 @@ os:
1010
- linux
1111

1212
go:
13-
- "1.12.15"
13+
- "1.12.16"
1414

1515
env:
1616
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic

‎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
@@ -67,7 +67,7 @@ github.com/modern-go/concurrent 1.0.3
6767
github.com/opencontainers/selinux 5215b1806f52b1fcc2070a8826c542c9d33cd3cf
6868
github.com/seccomp/libseccomp-golang v0.9.1
6969
github.com/tchap/go-patricia v2.2.6
70-
golang.org/x/crypto 5c40567a22f818bd14a1ea7245dad9f8ef0691aa
70+
golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
7171
golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33
7272
golang.org/x/time 85acf8d2951cb2a3bde7632f9ff273ef0379bcbd
7373
gopkg.in/inf.v0 v0.9.0

‎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)