Attachment 3211 Details for Bug 2939 – base64 and log key blob early

[patch] base64 and log key blob early

bz2939.diff (text/plain), 1.09 KB, created by Damien Miller on 2018-12-07 14:24:22 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2018-12-07 14:24:22 AEDT

Size: 1.09 KB

patch

obsolete

>commit d4960d5a805472972078ea154efb23d0d57b7fe8
>Author: Damien Miller <djm@mindrot.org>
>Date:   Fri Dec 7 14:22:47 2018 +1100
>
>    bz2939
>
>diff --git a/auth2-pubkey.c b/auth2-pubkey.c
>index e5e6da7..3ba4877 100644
>--- a/auth2-pubkey.c
>+++ b/auth2-pubkey.c
>@@ -99,6 +99,22 @@ userauth_pubkey(struct ssh *ssh)
> 	    (r = sshpkt_get_cstring(ssh, &pkalg, NULL)) != 0 ||
> 	    (r = sshpkt_get_string(ssh, &pkblob, &blen)) != 0)
> 		fatal("%s: parse request failed: %s", __func__, ssh_err(r));
>+
>+	if (log_level_get() >= SYSLOG_LEVEL_DEBUG2) {
>+		char *keystring;
>+		struct sshbuf *pkbuf;
>+
>+		if ((pkbuf = sshbuf_from(pkblob, blen)) == NULL)
>+			fatal("%s: sshbuf_from failed", __func__);
>+		if ((keystring = sshbuf_dtob64(pkbuf)) == NULL)
>+			fatal("%s: sshbuf_dtob64 failed", __func__);
>+		debug2("%s: %s user %s %s public key %s %s", __func__,
>+		    authctxt->valid ? "valid" : "invalid", authctxt->user,
>+		    have_sig ? "attempting" : "querying", pkalg, keystring);
>+		sshbuf_free(pkbuf);
>+		free(keystring);
>+	}
>+
> 	pktype = sshkey_type_from_name(pkalg);
> 	if (pktype == KEY_UNSPEC) {
> 		/* this is perfectly legal */

Actions: View | Diff

Attachments on bug 2939: 3209 | 3211