projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ability for ssh2_userkey_loadpub() to return the key comment.
[u/mdw/putty]
/
ssh.c
diff --git
a/ssh.c
b/ssh.c
index
0738b30
..
b30d026
100644
(file)
--- a/
ssh.c
+++ b/
ssh.c
@@
-6640,7
+6640,7
@@
static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
if (keytype == SSH_KEYTYPE_SSH2) {
s->publickey_blob =
ssh2_userkey_loadpub(&ssh->cfg.keyfile, NULL,
if (keytype == SSH_KEYTYPE_SSH2) {
s->publickey_blob =
ssh2_userkey_loadpub(&ssh->cfg.keyfile, NULL,
- &s->publickey_bloblen, NULL);
+ &s->publickey_bloblen, NULL
, NULL
);
} else {
char *msgbuf;
logeventf(ssh, "Unable to use this key file (%s)",
} else {
char *msgbuf;
logeventf(ssh, "Unable to use this key file (%s)",
@@
-6982,7
+6982,7
@@
static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
(unsigned char *)ssh2_userkey_loadpub(&ssh->cfg.keyfile,
&algorithm,
&pub_blob_len,
(unsigned char *)ssh2_userkey_loadpub(&ssh->cfg.keyfile,
&algorithm,
&pub_blob_len,
- NULL);
+ NULL
, NULL
);
if (pub_blob) {
s->pktout = ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST);
ssh2_pkt_addstring(s->pktout, s->username);
if (pub_blob) {
s->pktout = ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST);
ssh2_pkt_addstring(s->pktout, s->username);