summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Nilsson <hans@erlang.org>2017-11-15 14:29:47 +0100
committerHans Nilsson <hans@erlang.org>2017-11-15 14:33:43 +0100
commita36785f388f5545524832811b711748ca37b5209 (patch)
tree5c327222af4ab59bfa1745b6ef364bec7f7e4eed
parent47a9dd48cbb087e1936bee4859a60256f77c5243 (diff)
downloaderlang-a36785f388f5545524832811b711748ca37b5209.tar.gz
ssh: Unicode encoding fix
Conflicts: lib/ssh/src/ssh_connection_handler.erl
-rw-r--r--lib/ssh/src/ssh.hrl2
1 files changed, 1 insertions, 1 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).