chiark
/
gitweb
/
~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/catcrypt.1: The default `cipher' depends on the bulk transform.
[catacomb]
/
progs
/
catcrypt.1
diff --git
a/progs/catcrypt.1
b/progs/catcrypt.1
index 6c5544085b58657027e707e074082a1fad11601c..c26cbecea5fca603bf363affcf078a486cfab6cc 100644
(file)
--- a/
progs/catcrypt.1
+++ b/
progs/catcrypt.1
@@
-248,7
+248,12
@@
Makes use of
.B cipher
and
.B mac
.B cipher
and
.B mac
-attributes.
+attributes. Run
+.B catcrypt show cipher
+for a list of supported symmetric encryption algorithms; the default
+.I cipher
+is
+.BR blowfish-cbc .
This is the default transform.
.TP
.B naclbox
This is the default transform.
.TP
.B naclbox
@@
-286,11
+291,8
@@
attribute then the
.I bulk
in the
.I kemalgspec
.I bulk
in the
.I kemalgspec
-is used; if that it absent, then the default of
-.B blowfish-cbc
-is used. Run
-.B catcrypt show cipher
-for a list of supported symmetric encryption algorithms.
+is used; if that it absent, then the default depends on the bulk
+transform.
.TP
.B hash
This is the hash function used to distil entropy from the shared secret
.TP
.B hash
This is the hash function used to distil entropy from the shared secret
@@
-562,7
+564,9
@@
attribute.
The symmetric encryption algorithms which can be used in a
key-encapsulation key's
.B cipher
The symmetric encryption algorithms which can be used in a
key-encapsulation key's
.B cipher
-attribute.
+attribute when using the
+.B gencomp
+bulk transform.
.TP
.B mac
The message authentication algorithms which can be used in a
.TP
.B mac
The message authentication algorithms which can be used in a