From b2973dcf09bc714f8918b2b22faab8b80c60e695 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 9 Nov 2018 18:39:11 +0000
Subject: [PATCH] progs/catcrypt.1: The default `cipher' depends on the bulk
 transform.

As does the space of acceptable names.  Refactor the manual a little to
describe this properly.
---
 progs/catcrypt.1 | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/progs/catcrypt.1 b/progs/catcrypt.1
index 6c554408..c26cbece 100644
--- a/progs/catcrypt.1
+++ b/progs/catcrypt.1
@@ -248,7 +248,12 @@ Makes use of
 .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
@@ -286,11 +291,8 @@ attribute then the
 .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
@@ -562,7 +564,9 @@ attribute.
 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
-- 
2.11.0