diff options
author | Hans <[email protected]> | 2015-06-04 16:34:46 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-06-09 14:15:18 +0200 |
commit | ca4a952ab374f6cd9343c571e42605b23d51914c (patch) | |
tree | 2597ed4f435223bed9608a495fb0aafbc8210e20 /lib/ssh/src/ssh_auth.erl | |
parent | 07995bee41aeaace06e5a3e11912122e710552f5 (diff) | |
download | otp-ca4a952ab374f6cd9343c571e42605b23d51914c.tar.gz otp-ca4a952ab374f6cd9343c571e42605b23d51914c.tar.bz2 otp-ca4a952ab374f6cd9343c571e42605b23d51914c.zip |
ssh: Replace erlint/1 in ssh_message.erl and ssh_auth.erl
In the old times there was no binary notation which handled this particulary case, but now we can write big-signed-integer-unit:8 directly in binaries.
The undocumented internal function ssh_bits:erlint/1 is removed.
Diffstat (limited to 'lib/ssh/src/ssh_auth.erl')
-rw-r--r-- | lib/ssh/src/ssh_auth.erl | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl index df9a97c8f8..4cbfe81f18 100644 --- a/lib/ssh/src/ssh_auth.erl +++ b/lib/ssh/src/ssh_auth.erl @@ -483,22 +483,16 @@ keyboard_interact_fun(KbdInteractFun, Name, Instr, PromptInfos, NumPrompts) -> end. decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary, - ?UINT32(Len1), BinE:Len1/binary, - ?UINT32(Len2), BinN:Len2/binary>> + ?UINT32(Len1), E:Len1/big-signed-integer-unit:8, + ?UINT32(Len2), N:Len2/big-signed-integer-unit:8>> ,"ssh-rsa") -> - E = ssh_bits:erlint(Len1, BinE), - N = ssh_bits:erlint(Len2, BinN), {ok, #'RSAPublicKey'{publicExponent = E, modulus = N}}; decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary, - ?UINT32(Len1), BinP:Len1/binary, - ?UINT32(Len2), BinQ:Len2/binary, - ?UINT32(Len3), BinG:Len3/binary, - ?UINT32(Len4), BinY:Len4/binary>> + ?UINT32(Len1), P:Len1/big-signed-integer-unit:8, + ?UINT32(Len2), Q:Len2/big-signed-integer-unit:8, + ?UINT32(Len3), G:Len3/big-signed-integer-unit:8, + ?UINT32(Len4), Y:Len4/big-signed-integer-unit:8>> , "ssh-dss") -> - P = ssh_bits:erlint(Len1, BinP), - Q = ssh_bits:erlint(Len2, BinQ), - G = ssh_bits:erlint(Len3, BinG), - Y = ssh_bits:erlint(Len4, BinY), {ok, {Y, #'Dss-Parms'{p = P, q = Q, g = G}}}; decode_public_key_v2(_, _) -> |