diff options
| author | Erlang/OTP <[email protected]> | 2017-11-15 14:40:00 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-11-15 14:40:00 +0100 |
| commit | abff32568f62afd604e08fcd8333673271e9ec2f (patch) | |
| tree | ec728d95cd8d94dbb77103dfd53843aa72a9b9dd /lib/ssh/src | |
| parent | 5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b (diff) | |
| parent | a36785f388f5545524832811b711748ca37b5209 (diff) | |
| download | otp-abff32568f62afd604e08fcd8333673271e9ec2f.tar.gz otp-abff32568f62afd604e08fcd8333673271e9ec2f.tar.bz2 otp-abff32568f62afd604e08fcd8333673271e9ec2f.zip | |
Merge branch 'hans/ssh/dont_remove_trailing_ws_18/OTP-14763' into maint-18
* hans/ssh/dont_remove_trailing_ws_18/OTP-14763:
ssh: Unicode encoding fix
ssh: testcases for space trailing Hello msg
ssh: Don't remove trailing WS in Hello msg
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 2 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index f88098819d..b27e91213d 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -60,8 +60,8 @@ -define(uint16(X), << ?UINT16(X) >> ). -define(uint32(X), << ?UINT32(X) >> ). -define(uint64(X), << ?UINT64(X) >> ). --define(string(X), << ?STRING(list_to_binary(X)) >> ). -define(string_utf8(X), << ?STRING(unicode:characters_to_binary(X)) >> ). +-define(string(X), ?string_utf8(X)). -define(binary(X), << ?STRING(X) >>). -define(SSH_CIPHER_NONE, 0). diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 5391df723c..b2d655955f 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -1825,12 +1825,6 @@ same(Algs) -> [{client2server,Algs}, {server2client,Algs}]. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% trim_tail(Str) -> - lists:reverse(trim_head(lists:reverse(Str))). - -trim_head([$\s|Cs]) -> trim_head(Cs); -trim_head([$\t|Cs]) -> trim_head(Cs); -trim_head([$\n|Cs]) -> trim_head(Cs); -trim_head([$\r|Cs]) -> trim_head(Cs); -trim_head(Cs) -> Cs. - - + lists:takewhile(fun(C) -> + C=/=$\r andalso C=/=$\n + end, Str). |