diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-07-16 13:18:39 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-16 23:23:05 +1000 |
commit | 16dd8b2c78a0de106c7429e2a294d203f6bda3c7 (patch) | |
tree | c1f6e71fe7aa7985f055b6a66926def4c876dcb7 /auth2-pubkey.c | |
parent | 45478898f9590b5cc8bc7104e573b84be67443b0 (diff) |
upstream: remove mostly vestigal uuencode.[ch]; moving the only unique
functionality there (wrapping of base64-encoded data) to sshbuf functions;
feedback and ok markus@
OpenBSD-Commit-ID: 4dba6735d88c57232f6fccec8a08bdcfea44ac4c
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 05fa5c9f8..32ce19250 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.90 2019/06/21 03:19:59 djm Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.91 2019/07/16 13:18:39 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -109,7 +109,7 @@ userauth_pubkey(struct ssh *ssh) | |||
109 | 109 | ||
110 | if ((pkbuf = sshbuf_from(pkblob, blen)) == NULL) | 110 | if ((pkbuf = sshbuf_from(pkblob, blen)) == NULL) |
111 | fatal("%s: sshbuf_from failed", __func__); | 111 | fatal("%s: sshbuf_from failed", __func__); |
112 | if ((keystring = sshbuf_dtob64(pkbuf)) == NULL) | 112 | if ((keystring = sshbuf_dtob64_string(pkbuf, 0)) == NULL) |
113 | fatal("%s: sshbuf_dtob64 failed", __func__); | 113 | fatal("%s: sshbuf_dtob64 failed", __func__); |
114 | debug2("%s: %s user %s %s public key %s %s", __func__, | 114 | debug2("%s: %s user %s %s public key %s %s", __func__, |
115 | authctxt->valid ? "valid" : "invalid", authctxt->user, | 115 | authctxt->valid ? "valid" : "invalid", authctxt->user, |