diff options
| author | Hans Nilsson <[email protected]> | 2018-02-19 13:20:20 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-03-29 11:58:28 +0200 |
| commit | 759ffa6660a8c8d14cc7010d4678160006c9c8e5 (patch) | |
| tree | 7ccf7e05fec679b90b916e19bdc716ad9f8a4697 /lib/ssh/src | |
| parent | 18d9abb63605628e4564cb925f359c73e1f24c4f (diff) | |
| download | otp-759ffa6660a8c8d14cc7010d4678160006c9c8e5.tar.gz otp-759ffa6660a8c8d14cc7010d4678160006c9c8e5.tar.bz2 otp-759ffa6660a8c8d14cc7010d4678160006c9c8e5.zip | |
ssh: Unused fields #ssh.hkey and #ssh.kex removed
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 2 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 8d950eea3c..1a2f003190 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -151,8 +151,6 @@ algorithms, %% #alg{} - kex, %% key exchange algorithm - hkey, %% host key algorithm key_cb, %% Private/Public key callback module io_cb, %% Interaction callback module diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 975053d301..c221cf5905 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -1057,9 +1057,7 @@ install_alg(Dir, SSH) -> alg_setup(snd, SSH) -> ALG = SSH#ssh.algorithms, - SSH#ssh{kex = ALG#alg.kex, - hkey = ALG#alg.hkey, - encrypt = ALG#alg.encrypt, + SSH#ssh{encrypt = ALG#alg.encrypt, send_mac = ALG#alg.send_mac, send_mac_size = mac_digest_size(ALG#alg.send_mac), compress = ALG#alg.compress, @@ -1071,9 +1069,7 @@ alg_setup(snd, SSH) -> alg_setup(rcv, SSH) -> ALG = SSH#ssh.algorithms, - SSH#ssh{kex = ALG#alg.kex, - hkey = ALG#alg.hkey, - decrypt = ALG#alg.decrypt, + SSH#ssh{decrypt = ALG#alg.decrypt, recv_mac = ALG#alg.recv_mac, recv_mac_size = mac_digest_size(ALG#alg.recv_mac), decompress = ALG#alg.decompress, @@ -1810,7 +1806,7 @@ mac('hmac-sha2-512', Key, SeqNum, Data) -> hash(_SSH, _Char, 0) -> <<>>; hash(SSH, Char, N) -> - HashAlg = sha(SSH#ssh.kex), + HashAlg = sha(SSH#ssh.algorithms#alg.kex), K = SSH#ssh.shared_secret, H = SSH#ssh.exchanged_hash, K1 = crypto:hash(HashAlg, [K, H, Char, SSH#ssh.session_id]), |