diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-25 15:43:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-25 15:43:25 +0100 |
commit | 3d37dc639d87e4469a6457cf4592ff5b773d0777 (patch) | |
tree | f487a0db671b5303286a935b58577b0d50c64ab9 /vendor/golang.org/x/crypto/ssh/server.go | |
parent | 6babc9f20ca9e3633da1792a31d0391bde6201b6 (diff) | |
parent | 68c313911e8a3aed605a12398442212b99f41619 (diff) | |
download | podman-3d37dc639d87e4469a6457cf4592ff5b773d0777.tar.gz podman-3d37dc639d87e4469a6457cf4592ff5b773d0777.tar.bz2 podman-3d37dc639d87e4469a6457cf4592ff5b773d0777.zip |
Merge pull request #5297 from rhatdan/vendor
Update vendor of buildah and containers/common
Diffstat (limited to 'vendor/golang.org/x/crypto/ssh/server.go')
-rw-r--r-- | vendor/golang.org/x/crypto/ssh/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go index 7a5a1d7ad..7d42a8c88 100644 --- a/vendor/golang.org/x/crypto/ssh/server.go +++ b/vendor/golang.org/x/crypto/ssh/server.go @@ -284,8 +284,8 @@ func (s *connection) serverHandshake(config *ServerConfig) (*Permissions, error) func isAcceptableAlgo(algo string) bool { switch algo { - case KeyAlgoRSA, KeyAlgoDSA, KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521, KeyAlgoED25519, - CertAlgoRSAv01, CertAlgoDSAv01, CertAlgoECDSA256v01, CertAlgoECDSA384v01, CertAlgoECDSA521v01, CertAlgoED25519v01: + case KeyAlgoRSA, KeyAlgoDSA, KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521, KeyAlgoSKECDSA256, KeyAlgoED25519, KeyAlgoSKED25519, + CertAlgoRSAv01, CertAlgoDSAv01, CertAlgoECDSA256v01, CertAlgoECDSA384v01, CertAlgoECDSA521v01, CertAlgoSKECDSA256v01, CertAlgoED25519v01, CertAlgoSKED25519v01: return true } return false |