[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys + add ability...

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

details:   https://anonhg.NetBSD.org/src/rev/2e48ac924125
branches:  trunk
changeset: 758403:2e48ac924125
user:      agc <agc%NetBSD.org@localhost>
date:      Thu Nov 04 06:46:15 2010 +0000

description:
+ add ability in netpgpkeys(1) to specify the cipher (symmetric algorithm)
  as specified in RFC 5581
+ add the camellia cipher implementation from openssl

diffstat:

 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 |  17 ++++++++----
 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c |   5 +++
 2 files changed, 16 insertions(+), 6 deletions(-)

diffs (83 lines):

diff -r e9e6ba18f5ab -r 2e48ac924125 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
--- a/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1       Thu Nov 04 06:45:28 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1       Thu Nov 04 06:46:15 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpkeys.1,v 1.15 2010/11/03 02:36:13 agc Exp $
+.\" $NetBSD: netpgpkeys.1,v 1.16 2010/11/04 06:46:15 agc Exp $
 .\"
 .\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -67,11 +67,13 @@
 .Pp
 where the long options for all commands are:
 .Pp
+.Op Fl Fl cipher Ns = Ns Ar cipher\-algorithm
+.br
 .Op Fl Fl coredumps
 .br
-.Op Fl Fl hash Ns = Ns Ar hash-algorithm
+.Op Fl Fl hash Ns = Ns Ar hash\-algorithm
 .br
-.Op Fl Fl homedir Ns = Ns Ar home-directory
+.Op Fl Fl homedir Ns = Ns Ar home\-directory
 .br
 .Op Fl Fl keyring Ns = Ns Ar keyring
 .br
@@ -196,14 +198,17 @@
 In addition to one of the preceding commands, a number of qualifiers
 or options may be given.
 .Bl -tag -width Ar
-.It Fl Fl hash Ar hash-algorithm
+.It Fl Fl cipher Ar cipher\-algorithm
+Specify the cipher to be used for symmetric encryption.
+The default cipher is "CAST5".
+.It Fl Fl hash Ar hash\-algorithm
 Specify the hash algorithm which is used during fingerprint calculation.
 For reference, at the present time,
 .Xr ssh-keygen 1
 uses
 .Dq MD5
 for its fingerprint values.
-.It Fl Fl homedir Ar home-directory
+.It Fl Fl homedir Ar home\-directory
 Keyrings are normally located, for historical reasons, within
 the user's home directory in a subdirectory called
 .Dq Pa .gnupg
@@ -232,7 +237,7 @@
 The trust for a signed key is given by the other signers of that key.
 The 16 hexadecimal digit user identity should be used when specifying
 user identities - email addresses and names are provided as aliases.
-.It Fl Fl pass-fd Ns = Ns Ar fd
+.It Fl Fl pass\-fd Ns = Ns Ar fd
 This option is intended for the use of external programs which may
 like to use the
 .Xr libnetpgp 3
diff -r e9e6ba18f5ab -r 2e48ac924125 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
--- a/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c       Thu Nov 04 06:45:28 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c       Thu Nov 04 06:46:15 2010 +0000
@@ -93,6 +93,7 @@
        PASSWDFD,
        RESULTS,
        SSHKEYFILE,
+       CIPHER,
 
        /* debug */
        OPS_DEBUG
@@ -135,6 +136,7 @@
        {"verbose",     no_argument,            NULL,   VERBOSE},
        {"pass-fd",     required_argument,      NULL,   PASSWDFD},
        {"results",     required_argument,      NULL,   RESULTS},
+       {"cipher",      required_argument,      NULL,   CIPHER},
        { NULL,         0,                      NULL,   0},
 };
 
@@ -318,6 +320,9 @@
                netpgp_setvar(netpgp, "ssh keys", "1");
                netpgp_setvar(netpgp, "sshkeyfile", arg);
                break;
+       case CIPHER:
+               netpgp_setvar(netpgp, "cipher", arg);
+               break;
        case OPS_DEBUG:
                netpgp_set_debug(arg);
                break;