diff options
author | Péter Szilágyi <peterke@gmail.com> | 2019-01-04 15:51:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 15:51:12 +0800 |
commit | 391d4cb9b53eb9f71862cbb8a6cca332d5a76f94 (patch) | |
tree | 7697f49be5353066df0968ff8af4169dfda2cdb1 /vendor/golang.org/x/crypto/ssh/handshake.go | |
parent | 3f421aca54bb5216e0f949966481fa4516c52273 (diff) | |
parent | 8ec344bf604a56e4bd313660448345708c5aeb51 (diff) | |
download | go-tangerine-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar go-tangerine-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.gz go-tangerine-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.bz2 go-tangerine-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.lz go-tangerine-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.xz go-tangerine-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.zst go-tangerine-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.zip |
Merge pull request #18390 from realdave/remove-sha3-pkg
vendor, crypto, swarm: switch over to upstream sha3 package
Diffstat (limited to 'vendor/golang.org/x/crypto/ssh/handshake.go')
-rw-r--r-- | vendor/golang.org/x/crypto/ssh/handshake.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vendor/golang.org/x/crypto/ssh/handshake.go b/vendor/golang.org/x/crypto/ssh/handshake.go index 932ce8393..4f7912ecd 100644 --- a/vendor/golang.org/x/crypto/ssh/handshake.go +++ b/vendor/golang.org/x/crypto/ssh/handshake.go @@ -78,6 +78,11 @@ type handshakeTransport struct { dialAddress string remoteAddr net.Addr + // bannerCallback is non-empty if we are the client and it has been set in + // ClientConfig. In that case it is called during the user authentication + // dance to handle a custom server's message. + bannerCallback BannerCallback + // Algorithms agreed in the last key exchange. algorithms *algorithms @@ -120,6 +125,7 @@ func newClientTransport(conn keyingTransport, clientVersion, serverVersion []byt t.dialAddress = dialAddr t.remoteAddr = addr t.hostKeyCallback = config.HostKeyCallback + t.bannerCallback = config.BannerCallback if config.HostKeyAlgorithms != nil { t.hostKeyAlgorithms = config.HostKeyAlgorithms } else { |