File 0615-ssh-test-Fix-misspeling.patch of Package erlang
From 0a2eb693efe0c3c053cbf0db6d1b27982be2d6ee Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 14 Nov 2019 12:09:53 +0100
Subject: [PATCH 1/6] ssh/test: Fix misspeling
---
lib/ssh/test/ssh_basic_SUITE.erl | 4 ++--
lib/ssh/test/ssh_test_lib.erl | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index af4a3584bf..b165911db6 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -260,7 +260,7 @@ init_per_group(rsa_pass_key, Config) ->
true ->
DataDir = proplists:get_value(data_dir, Config),
PrivDir = proplists:get_value(priv_dir, Config),
- ssh_test_lib:setup_rsa_pass_pharse(DataDir, PrivDir, "Password"),
+ ssh_test_lib:setup_rsa_pass_phrase(DataDir, PrivDir, "Password"),
[{pass_phrase, {rsa_pass_phrase, "Password"}}| Config];
false ->
{skip, unsupported_pub_key}
@@ -271,7 +271,7 @@ init_per_group(dsa_pass_key, Config) ->
true ->
DataDir = proplists:get_value(data_dir, Config),
PrivDir = proplists:get_value(priv_dir, Config),
- ssh_test_lib:setup_dsa_pass_pharse(DataDir, PrivDir, "Password"),
+ ssh_test_lib:setup_dsa_pass_phrase(DataDir, PrivDir, "Password"),
[{pass_phrase, {dsa_pass_phrase, "Password"}}| Config];
false ->
{skip, unsupported_pub_key}
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 8bd00397d5..d205cef579 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -451,9 +451,9 @@ clean_rsa(UserDir) ->
file:delete(filename:join(UserDir,"known_hosts")),
file:delete(filename:join(UserDir,"authorized_keys")).
-setup_dsa_pass_pharse(DataDir, UserDir, Phrase) ->
+setup_dsa_pass_phrase(DataDir, UserDir, Phrase) ->
{ok, KeyBin} = file:read_file(filename:join(DataDir, "id_dsa")),
- setup_pass_pharse(KeyBin, filename:join(UserDir, "id_dsa"), Phrase),
+ setup_pass_phrase(KeyBin, filename:join(UserDir, "id_dsa"), Phrase),
System = filename:join(UserDir, "system"),
file:make_dir(System),
file:copy(filename:join(DataDir, "ssh_host_dsa_key"), filename:join(System, "ssh_host_dsa_key")),
@@ -461,9 +461,9 @@ setup_dsa_pass_pharse(DataDir, UserDir, Phrase) ->
setup_dsa_known_host(DataDir, UserDir),
setup_dsa_auth_keys(DataDir, UserDir).
-setup_rsa_pass_pharse(DataDir, UserDir, Phrase) ->
+setup_rsa_pass_phrase(DataDir, UserDir, Phrase) ->
{ok, KeyBin} = file:read_file(filename:join(DataDir, "id_rsa")),
- setup_pass_pharse(KeyBin, filename:join(UserDir, "id_rsa"), Phrase),
+ setup_pass_phrase(KeyBin, filename:join(UserDir, "id_rsa"), Phrase),
System = filename:join(UserDir, "system"),
file:make_dir(System),
file:copy(filename:join(DataDir, "ssh_host_rsa_key"), filename:join(System, "ssh_host_rsa_key")),
@@ -481,7 +481,7 @@ setup_ecdsa_pass_phrase(Size, DataDir, UserDir, Phrase) ->
Other ->
Other
end,
- setup_pass_pharse(KeyBin, filename:join(UserDir, "id_ecdsa"), Phrase),
+ setup_pass_phrase(KeyBin, filename:join(UserDir, "id_ecdsa"), Phrase),
System = filename:join(UserDir, "system"),
file:make_dir(System),
file:copy(filename:join(DataDir, "ssh_host_ecdsa_key"++Size), filename:join(System, "ssh_host_ecdsa_key")),
@@ -494,7 +494,7 @@ setup_ecdsa_pass_phrase(Size, DataDir, UserDir, Phrase) ->
_:_ -> false
end.
-setup_pass_pharse(KeyBin, OutFile, Phrase) ->
+setup_pass_phrase(KeyBin, OutFile, Phrase) ->
[{KeyType, _,_} = Entry0] = public_key:pem_decode(KeyBin),
Key = public_key:pem_entry_decode(Entry0),
Salt = crypto:strong_rand_bytes(8),
--
2.16.4