Module Name: src
Committed By: agc
Date: Thu Nov 4 06:46:15 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.1
netpgpkeys.c
Log Message:
+ add ability in netpgpkeys(1) to specify the cipher (symmetric algorithm)
as specified in RFC 5581
+ add the camellia cipher implementation from openssl
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
cvs rdiff -u -r1.20 -r1.21 \
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.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.15 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.16
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.15 Wed Nov 3 02:36:13 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 Thu Nov 4 06:46:15 2010
@@ -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
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.20 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.21
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.20 Sun Oct 31 20:05:04 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Thu Nov 4 06:46:15 2010
@@ -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;
