From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 2 Oct 2019 08:07:13 +0000 (+0000)
Subject: upstream: make signature format match PROTOCO
X-Git-Tag: V_8_1_P1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5a89eec410967d6b712665f8cf0cb632928d74b;p=thirdparty%2Fopenssh-portable.git

upstream: make signature format match PROTOCO

=?UTF-8?q?=20as=20a=20string,=20not=20raw=20bytes.=20Spotted=20by=20Manta?=
=?UTF-8?q?s=20Mikul=C4=97nas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OpenBSD-Commit-ID: 80fcc6d52893f80c6de2bedd65353cebfebcfa8f
---

diff --git a/sshsig.c b/sshsig.c
index b993b7c1e..b19cd077d 100644
--- a/sshsig.c
+++ b/sshsig.c
@@ -172,7 +172,7 @@ sshsig_wrap_sign(struct sshkey *key, const char *hashalg,
 	    (r = sshbuf_put_cstring(tosign, sig_namespace)) != 0 ||
 	    (r = sshbuf_put_string(tosign, NULL, 0)) != 0 || /* reserved */
 	    (r = sshbuf_put_cstring(tosign, hashalg)) != 0 ||
-	    (r = sshbuf_putb(tosign, h_message)) != 0) {
+	    (r = sshbuf_put_stringb(tosign, h_message)) != 0) {
 		error("Couldn't construct message to sign: %s", ssh_err(r));
 		goto done;
 	}
@@ -308,7 +308,7 @@ sshsig_wrap_verify(struct sshbuf *signature, const char *hashalg,
 	    (r = sshbuf_put_cstring(toverify, expect_namespace)) != 0 ||
 	    (r = sshbuf_put_string(toverify, NULL, 0)) != 0 || /* reserved */
 	    (r = sshbuf_put_cstring(toverify, hashalg)) != 0 ||
-	    (r = sshbuf_putb(toverify, h_message)) != 0) {
+	    (r = sshbuf_put_stringb(toverify, h_message)) != 0) {
 		error("Couldn't construct message to verify: %s", ssh_err(r));
 		goto done;
 	}