projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the half-hearted attempt to make the utmp helper process drop
[u/mdw/putty]
/
cmdgen.c
diff --git
a/cmdgen.c
b/cmdgen.c
index
5b0e54d
..
33662c3
100644
(file)
--- a/
cmdgen.c
+++ b/
cmdgen.c
@@
-118,10
+118,7
@@
void sk_cleanup(void)
void showversion(void)
{
void showversion(void)
{
- char *verstr = dupstr(ver);
- verstr[0] = tolower((unsigned char)verstr[0]);
- printf("PuTTYgen %s\n", verstr);
- sfree(verstr);
+ printf("puttygen: %s\n", ver);
}
void usage(int standalone)
}
void usage(int standalone)
@@
-766,6
+763,9
@@
int main(int argc, char **argv)
}
ssh1key->comment = dupstr(origcomment);
ssh1key->private_exponent = NULL;
}
ssh1key->comment = dupstr(origcomment);
ssh1key->private_exponent = NULL;
+ ssh1key->p = NULL;
+ ssh1key->q = NULL;
+ ssh1key->iqmp = NULL;
} else {
ret = loadrsakey(infilename, ssh1key, passphrase, &error);
}
} else {
ret = loadrsakey(infilename, ssh1key, passphrase, &error);
}
@@
-779,11
+779,13
@@
int main(int argc, char **argv)
if (!load_encrypted) {
ssh2blob = ssh2_userkey_loadpub(infilename, &ssh2alg,
&ssh2bloblen, NULL, &error);
if (!load_encrypted) {
ssh2blob = ssh2_userkey_loadpub(infilename, &ssh2alg,
&ssh2bloblen, NULL, &error);
- ssh2algf = find_pubkey_alg(ssh2alg);
- if (ssh2algf)
- bits = ssh2algf->pubkey_bits(ssh2blob, ssh2bloblen);
- else
- bits = -1;
+ if (ssh2blob) {
+ ssh2algf = find_pubkey_alg(ssh2alg);
+ if (ssh2algf)
+ bits = ssh2algf->pubkey_bits(ssh2blob, ssh2bloblen);
+ else
+ bits = -1;
+ }
} else {
ssh2key = ssh2_load_userkey(infilename, passphrase, &error);
}
} else {
ssh2key = ssh2_load_userkey(infilename, passphrase, &error);
}