security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

tools: Fix gpgkey2ssh's most gratuitous errors. Use gpg2, not gpg.

Browse Source 
* tools/gpgkey2ssh.c (main): Add support for --help.  Replace the most
gratuitous asserts with error messages.  Invoke gpg2, not gpg.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
Debian-bug-id: 380241
This commit is contained in:
Neal H. Walfield 2015-11-05 13:59:33 +01:00
parent 2b27acc343
commit cd2d685230
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tools/gpgkey2ssh.c
View File

@ -248,7 +248,7 @@ main (int argc, char **argv)
int algorithm_id; int algorithm_id;
pkdbuf_t *pkdbuf; pkdbuf_t *pkdbuf;
size_t pkdbuf_n; size_t pkdbuf_n;
char *command; char *command = NULL;
FILE *fp; FILE *fp;
int ret; int ret;
gcry_error_t err; gcry_error_t err;
@ -263,21 +263,50 @@ main (int argc, char **argv)
algorithm_id = 0; /* (avoid cc warning) */ algorithm_id = 0; /* (avoid cc warning) */
identifier = NULL; /* (avoid cc warning) */ identifier = NULL; /* (avoid cc warning) */
assert (argc == 2); if (argc != 2)
{
fprintf (stderr, "Usage: %s KEYID\n", argv[0]);
exit (1);
}
if (strcmp (argv[1], "--help") == 0)
{
fprintf (stderr, "Usage: %s KEYID\n", argv[0]);
fprintf (stderr, "\n");
fprintf (stderr,
"Convert a gpg key to a format appropriate for inclusion in an\n"
"ssh authorized_keys file.\n");
exit (0);
}
keyid = argv[1]; keyid = argv[1];
ret = asprintf (&command, asprintf (&command,
"gpg --list-keys --with-colons --with-key-data '%s'", "gpg2 --list-keys --with-colons --with-key-data '%s'",
keyid); keyid);
assert (ret > 0); if (! command)
{
fprintf (stderr, "Out of memory.\n");
exit (1);
}
fp = popen (command, "r"); fp = popen (command, "r");
assert (fp); if (! fp)
{
fprintf (stderr, "Failed to running: '%s'\n", command);
exit (1);
}
err = retrieve_key_material (fp, keyid, &algorithm_id, &pkdbuf, &pkdbuf_n); err = retrieve_key_material (fp, keyid, &algorithm_id, &pkdbuf, &pkdbuf_n);
assert (! err); if (err)
assert ((algorithm_id == 1) || (algorithm_id == 17)); {
fprintf (stderr, "Error looking up key: %s\n", gpg_strerror (err));
exit (1);
}
if (! ((algorithm_id == 1) || (algorithm_id == 17)))
{
fprintf (stderr, "Unsupported algorithm: %d\n", algorithm_id);
exit (1);
}
if (algorithm_id == 1) if (algorithm_id == 1)
{ {