Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

18 files changed, 61 insertions, 0 deletions

diff --git a/test/fixtures/_known_hosts/.ssh/config_asterisk_1 b/test/fixtures/_known_hosts/.ssh/config_asterisk_1
new file mode 100644
index 0000000..fc09eb0
--- /dev/null
+++ b/test/fixtures/_known_hosts/.ssh/config_asterisk_1
@@ -0,0 +1 @@
+Host asterisk_1
diff --git a/test/fixtures/_known_hosts/.ssh/config_asterisk_2 b/test/fixtures/_known_hosts/.ssh/config_asterisk_2
new file mode 100644
index 0000000..42243ad
--- /dev/null
+++ b/test/fixtures/_known_hosts/.ssh/config_asterisk_2
@@ -0,0 +1 @@
+Host asterisk_2
diff --git a/test/fixtures/_known_hosts/.ssh/config_question_mark b/test/fixtures/_known_hosts/.ssh/config_question_mark
new file mode 100644
index 0000000..08e1201
--- /dev/null
+++ b/test/fixtures/_known_hosts/.ssh/config_question_mark
@@ -0,0 +1 @@
+Host question_mark
diff --git a/test/fixtures/_known_hosts/.ssh/config_relative_path b/test/fixtures/_known_hosts/.ssh/config_relative_path
new file mode 100644
index 0000000..a7ad4d1
--- /dev/null
+++ b/test/fixtures/_known_hosts/.ssh/config_relative_path
@@ -0,0 +1 @@
+Host relative_path
diff --git a/test/fixtures/_known_hosts/config b/test/fixtures/_known_hosts/config
new file mode 100644
index 0000000..fad532b
--- /dev/null
+++ b/test/fixtures/_known_hosts/config
@@ -0,0 +1,9 @@
+    UserKnownHostsFile _known_hosts/known_hosts
+
+    # Unindented
+Host *
+     IPQoS none
+Host gee* jar?this-part-we-do-not-complete-at-least-yet
+     HostName %h.example.com
+	# Indented, with = separator
+    Host = hus%%eth0 !negated  #not-a-comment
diff --git a/test/fixtures/_known_hosts/config_full_path b/test/fixtures/_known_hosts/config_full_path
new file mode 100644
index 0000000..a91649b
--- /dev/null
+++ b/test/fixtures/_known_hosts/config_full_path
@@ -0,0 +1 @@
+Include ~/config_include_recursion
diff --git a/test/fixtures/_known_hosts/config_include b/test/fixtures/_known_hosts/config_include
new file mode 100644
index 0000000..d68b0d8
--- /dev/null
+++ b/test/fixtures/_known_hosts/config_include
@@ -0,0 +1,9 @@
+#$HOME set to fixtures/_known_hosts in unit test
+# Include with full path (recursive one)
+Include ~/config_full_path
+# Include with relative path
+Include config_relative_path
+# Include with wildcards, and more than one on same row
+Include config_asterisk* config_?uestion_mark
+# Include a directory name.  This is a misconfiguration, but ssh ignores it without errors.
+Include ../../_known_hosts
diff --git a/test/fixtures/_known_hosts/config_include_recursion b/test/fixtures/_known_hosts/config_include_recursion
new file mode 100644
index 0000000..2777069
--- /dev/null
+++ b/test/fixtures/_known_hosts/config_include_recursion
@@ -0,0 +1 @@
+Host recursion
diff --git a/test/fixtures/_known_hosts/config_tilde b/test/fixtures/_known_hosts/config_tilde
new file mode 100644
index 0000000..93e495b
--- /dev/null
+++ b/test/fixtures/_known_hosts/config_tilde
@@ -0,0 +1,4 @@
+# With quotes and tilde, and =
+UserKnownHostsFile = "~/_known_hosts/known_hosts2"
+# Without quotes, with tilde, and another on the same line
+UserKnownHostsFile ~/_known_hosts/known_hosts3 _known_hosts/known_hosts4
diff --git a/test/fixtures/_known_hosts/gee-filename-canary b/test/fixtures/_known_hosts/gee-filename-canary
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/fixtures/_known_hosts/gee-filename-canary
diff --git a/test/fixtures/_known_hosts/known_hosts b/test/fixtures/_known_hosts/known_hosts
new file mode 100644
index 0000000..646b5b6
--- /dev/null
+++ b/test/fixtures/_known_hosts/known_hosts
@@ -0,0 +1,14 @@
+|1|abc
+|1|def
+doo
+# this is a comment
+ike ssh-rsa qwerty1234/Qwerty+1234==
+jub,10.0.0.1
+@cert-authority  kyl,100.0.0.2 xxxfoo
+[10.10.0.3]:10022
+[blah]:1234
+fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555
+fe80::123:0xff:dead:beef%eth0
+1111:2222:3333:4444:5555:6666:xxxx:abab
+11xx:2222:3333:4444:5555:6666:xxxx:abab
+::42
diff --git a/test/fixtures/_known_hosts/known_hosts2 b/test/fixtures/_known_hosts/known_hosts2
new file mode 100644
index 0000000..2eb4d4f
--- /dev/null
+++ b/test/fixtures/_known_hosts/known_hosts2
@@ -0,0 +1 @@
+two,two2,two3,two*,t?o,two4
diff --git a/test/fixtures/_known_hosts/known_hosts3 b/test/fixtures/_known_hosts/known_hosts3
new file mode 100644
index 0000000..2bdf67a
--- /dev/null
+++ b/test/fixtures/_known_hosts/known_hosts3
@@ -0,0 +1 @@
+three
diff --git a/test/fixtures/_known_hosts/known_hosts4 b/test/fixtures/_known_hosts/known_hosts4
new file mode 100644
index 0000000..8510665
--- /dev/null
+++ b/test/fixtures/_known_hosts/known_hosts4
@@ -0,0 +1 @@
+four
diff --git a/test/fixtures/_known_hosts/localhost_config b/test/fixtures/_known_hosts/localhost_config
new file mode 100644
index 0000000..3c6a209
--- /dev/null
+++ b/test/fixtures/_known_hosts/localhost_config
@@ -0,0 +1 @@
+UserKnownHostsFile _known_hosts/localhost_hosts
diff --git a/test/fixtures/_known_hosts/localhost_hosts b/test/fixtures/_known_hosts/localhost_hosts
new file mode 100644
index 0000000..ff752c2
--- /dev/null
+++ b/test/fixtures/_known_hosts/localhost_hosts
@@ -0,0 +1,3 @@
+localhost
+127.0.0.1
+::1
diff --git a/test/fixtures/_known_hosts/spaced  conf b/test/fixtures/_known_hosts/spaced  conf
new file mode 100644
index 0000000..ac0891e
--- /dev/null
+++ b/test/fixtures/_known_hosts/spaced  conf
@@ -0,0 +1,8 @@
+
+    # Unindented
+Host gee
+    UserKnownHostsFile "_known_hosts/spaced  known_hosts"
+
+	# Indented
+    Host hus  #not-a-comment
+    UserKnownHostsFile "_known_hosts/known_hosts2"
diff --git a/test/fixtures/_known_hosts/spaced  known_hosts b/test/fixtures/_known_hosts/spaced  known_hosts
new file mode 100644
index 0000000..d54a04d
--- /dev/null
+++ b/test/fixtures/_known_hosts/spaced  known_hosts
@@ -0,0 +1,4 @@
+|1|abc
+|1|def
+doo
+ike ssh-rsa qwerty1234/Qwerty+1234==