Module Name: src
Committed By: agc
Date: Wed Apr 14 00:26:25 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c
Log Message:
allow the user to pass the equivalent of the gecos information into the
key generation function.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.9 Sat Mar 13 23:30:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Wed Apr 14 00:26:25 2010
@@ -101,7 +101,7 @@
{"find-key", no_argument, NULL, FIND_KEY},
{"export-key", no_argument, NULL, EXPORT_KEY},
{"import-key", no_argument, NULL, IMPORT_KEY},
- {"generate-key", no_argument, NULL, GENERATE_KEY},
+ {"generate-key", optional_argument, NULL, GENERATE_KEY},
{"get-key", no_argument, NULL, GET_KEY},
/* debugging commands */
{"help", no_argument, NULL, HELP_CMD},
@@ -157,8 +157,7 @@
case FIND_KEY:
return netpgp_find_key(netpgp, netpgp_getvar(netpgp, "userid"));
case EXPORT_KEY:
- key = netpgp_export_key(netpgp,
- netpgp_getvar(netpgp, "userid"));
+ key = netpgp_export_key(netpgp, netpgp_getvar(netpgp, "userid"));
if (key) {
printf("%s", key);
return 1;
@@ -168,8 +167,7 @@
case IMPORT_KEY:
return netpgp_import_key(netpgp, f);
case GENERATE_KEY:
- return netpgp_generate_key(netpgp,
- netpgp_getvar(netpgp, "userid"), p->numbits);
+ return netpgp_generate_key(netpgp, f, p->numbits);
case GET_KEY:
key = netpgp_get_key(netpgp, f, "human");
if (key) {
