From 8bff7e0d6b511d2b351c51f86933ac2eaa7c6180 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Aug 27 2018 14:55:32 +0000
Subject: Related: #1622594 - tests: make ssh-keygen always produce PEM format


The default format produced by openssh-7.8p1 cannot be consumed
by currently available versions of libssh and libssh2.

---

diff --git a/0105-curl-7.61.0-tests-ssh-keygen.patch b/0105-curl-7.61.0-tests-ssh-keygen.patch
new file mode 100644
index 0000000..b8b9ffb
--- /dev/null
+++ b/0105-curl-7.61.0-tests-ssh-keygen.patch
@@ -0,0 +1,33 @@
+From daded1aff280104d16e405fcd1be1a857c74b191 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 27 Aug 2018 15:53:35 +0200
+Subject: [PATCH] tests: make ssh-keygen always produce PEM format
+
+The default format produced by openssh-7.8p1 cannot be consumed
+by currently available versions of libssh and libssh2.
+---
+ tests/sshserver.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/sshserver.pl b/tests/sshserver.pl
+index 9b3d122..d477a02 100755
+--- a/tests/sshserver.pl
++++ b/tests/sshserver.pl
+@@ -372,12 +372,12 @@ if((! -e $hstprvkeyf) || (! -s $hstprvkeyf) ||
+     # Make sure all files are gone so ssh-keygen doesn't complain
+     unlink($hstprvkeyf, $hstpubkeyf, $cliprvkeyf, $clipubkeyf);
+     logmsg 'generating host keys...' if($verbose);
+-    if(system "\"$sshkeygen\" -q -t rsa -f $hstprvkeyf -C 'curl test server' -N ''") {
++    if(system "\"$sshkeygen\" -q -t rsa -f $hstprvkeyf -C 'curl test server' -N '' -m PEM") {
+         logmsg 'Could not generate host key';
+         exit 1;
+     }
+     logmsg 'generating client keys...' if($verbose);
+-    if(system "\"$sshkeygen\" -q -t rsa -f $cliprvkeyf -C 'curl test client' -N ''") {
++    if(system "\"$sshkeygen\" -q -t rsa -f $cliprvkeyf -C 'curl test client' -N '' -m PEM") {
+         logmsg 'Could not generate client key';
+         exit 1;
+     }
+-- 
+2.17.1
+
diff --git a/curl.spec b/curl.spec
index 8c2b8bb..41e828b 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.61.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
@@ -23,6 +23,9 @@ Patch103: 0103-curl-7.59.0-python3.patch
 # use localhost6 instead of ip6-localhost in the curl test-suite
 Patch104: 0104-curl-7.19.7-localhost6.patch
 
+# tests: make ssh-keygen always produce PEM format (#1622594)
+Patch105: 0105-curl-7.61.0-tests-ssh-keygen.patch
+
 Provides: curl-full = %{version}-%{release}
 Provides: webclient
 URL: https://curl.haxx.se/
@@ -169,6 +172,7 @@ be installed.
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
 
 # make tests/*.py use Python 3
 sed -e '1 s|^#!/.*python|#!%{__python3}|' -i tests/*.py
@@ -329,6 +333,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
 
 %changelog
+* Mon Aug 27 2018 Kamil Dudka <kdudka@redhat.com> - 7.61.0-7
+- tests: make ssh-keygen always produce PEM format (#1622594)
+
 * Wed Aug 15 2018 Kamil Dudka <kdudka@redhat.com> - 7.61.0-6
 - scp/sftp: fix infinite connect loop on invalid private key (#1595135)