[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys allow the use...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/105344b7ddf6
branches:  trunk
changeset: 753920:105344b7ddf6
user:      agc <agc%NetBSD.org@localhost>
date:      Wed Apr 14 00:26:25 2010 +0000

description:
allow the user to pass the equivalent of the gecos information into the
key generation function.

diffstat:

 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r ce722a74752f -r 105344b7ddf6 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
--- a/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c       Wed Apr 14 00:25:10 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c       Wed Apr 14 00:26:25 2010 +0000
@@ -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) {