diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-24 16:15:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-24 16:15:12 +0100 |
commit | b6765c17e6d74430db30d382ac899d4fc888afd5 (patch) | |
tree | dc1aaab64821edbb536ded9546ada071e7991c0c /vendor/golang.org/x/crypto/internal | |
parent | 3f5af4e80686cb732730bd27fe7fc1c64580c494 (diff) | |
parent | a457c5c92858f3fe608785293fb72934ed177ad5 (diff) | |
download | podman-b6765c17e6d74430db30d382ac899d4fc888afd5.tar.gz podman-b6765c17e6d74430db30d382ac899d4fc888afd5.tar.bz2 podman-b6765c17e6d74430db30d382ac899d4fc888afd5.zip |
Merge pull request #9071 from TomSweeneyRedHat/dev/tsweeney/bump_crypto2
Bump golang.org/x/crypto
Diffstat (limited to 'vendor/golang.org/x/crypto/internal')
-rw-r--r-- | vendor/golang.org/x/crypto/internal/subtle/aliasing.go | 2 | ||||
-rw-r--r-- | vendor/golang.org/x/crypto/internal/subtle/aliasing_purego.go (renamed from vendor/golang.org/x/crypto/internal/subtle/aliasing_appengine.go) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/golang.org/x/crypto/internal/subtle/aliasing.go b/vendor/golang.org/x/crypto/internal/subtle/aliasing.go index f38797bfa..281c27ef0 100644 --- a/vendor/golang.org/x/crypto/internal/subtle/aliasing.go +++ b/vendor/golang.org/x/crypto/internal/subtle/aliasing.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !appengine +// +build !purego // Package subtle implements functions that are often useful in cryptographic // code but require careful thought to use correctly. diff --git a/vendor/golang.org/x/crypto/internal/subtle/aliasing_appengine.go b/vendor/golang.org/x/crypto/internal/subtle/aliasing_purego.go index 0cc4a8a64..e20a29659 100644 --- a/vendor/golang.org/x/crypto/internal/subtle/aliasing_appengine.go +++ b/vendor/golang.org/x/crypto/internal/subtle/aliasing_purego.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build appengine +// +build purego // Package subtle implements functions that are often useful in cryptographic // code but require careful thought to use correctly. |