openssh: backport patch to fix "invalid format"

Due to a bug in newer OpenSSH versions, when the public key is absent,
loading a private key in OpenSSL format will print the warning "invalid
format".

This has been fixed in OpenSSH, but not released yet. So we simply
backport that fix.

This fixes git-for-windows/git#2743

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

openssh/PKGBUILD

@@ -14,13 +14,15 @@ source=("https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgna
         0001-Forward-port-MSys2-patches.patch
         0002-openssh-work-around-Cygwin-declaring-setkey.patch
         0003-openssh-skip-privilege-separation-tests.patch
-        0004-Allow-scp-to-copy-files-that-start-with-a-Windows-dr.patch)
+        0004-Allow-scp-to-copy-files-that-start-with-a-Windows-dr.patch
+        c514f3c0522855b4d548286eaa113e209051a6d2.patch)
 sha256sums=('f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2'
             'SKIP'
             '572d8aa267a493205e3e6d5b194bf1800e161c3745a07e36cdf325b8014c99b8'
             '7eca1a47c2b523945899d5b7ad0418e00e7a5a30f4d6a6d3414a7328b520fd7e'
             'e06ff5a726761d067e67e0f42ecad8d4786a8f31d3269dedf034798f3e9103ca'
-            'edad721c623aa96506c23444aedfdea8b7a4659574b55b05755e913879dbf3c6')
+            'edad721c623aa96506c23444aedfdea8b7a4659574b55b05755e913879dbf3c6'
+            'ec9469a19f57138bb22f42691f0db591d4f700462e415580ab41e4ff79364021')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config')
@@ -31,6 +33,7 @@ prepare() {
   patch -p1 -i ${srcdir}/0002-openssh-work-around-Cygwin-declaring-setkey.patch
   patch -p1 -i ${srcdir}/0003-openssh-skip-privilege-separation-tests.patch
   patch -p1 -i ${srcdir}/0004-Allow-scp-to-copy-files-that-start-with-a-Windows-dr.patch
+  patch -p1 -i ${srcdir}/c514f3c0522855b4d548286eaa113e209051a6d2.patch
   autoreconf -fvi
 }
 

openssh/c514f3c0522855b4d548286eaa113e209051a6d2.patch

@@ -0,0 +1,47 @@
+From c514f3c0522855b4d548286eaa113e209051a6d2 Mon Sep 17 00:00:00 2001
+From: "[email protected]" <[email protected]>
+Date: Thu, 18 Jun 2020 23:33:38 +0000
+Subject: [PATCH] upstream: avoid spurious "Unable to load host key" message
+ when
+
+sshd can load a private key but no public counterpart; with & ok markus@
+
+OpenBSD-Commit-ID: 0713cbdf9aa1ff8ac7b1f78b09ac911af510f81b
+---
+ authfile.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/authfile.c b/authfile.c
+index 35ccf576c..946f50ca8 100644
+--- a/authfile.c
++++ b/authfile.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: authfile.c,v 1.140 2020/04/17 07:15:11 djm Exp $ */
++/* $OpenBSD: authfile.c,v 1.141 2020/06/18 23:33:38 djm Exp $ */
+ /*
+  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
+  *
+@@ -263,7 +263,7 @@ int
+ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
+ {
+ 	char *pubfile = NULL;
+-	int r;
++	int r, oerrno;
+ 
+ 	if (keyp != NULL)
+ 		*keyp = NULL;
+@@ -283,8 +283,14 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
+ 	if ((r = sshkey_load_pubkey_from_private(filename, keyp)) == 0)
+ 		goto out;
+ 
++	/* Pretend we couldn't find the key */
++	r = SSH_ERR_SYSTEM_ERROR;
++	errno = ENOENT;
++
+  out:
++	oerrno = errno;
+ 	free(pubfile);
++	errno = oerrno;
+ 	return r;
+ }
+