From 424de4eadd8f35c50e4c2805a62cba5eacb4a915 Mon Sep 17 00:00:00 2001 Message-Id: <424de4eadd8f35c50e4c2805a62cba5eacb4a915.1715776052.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 22 Sep 2019 14:43:41 +0100 Subject: [PATCH] server/tripe-admin.5.in: Reorder the `KEYMGMT' warnings. Organization: Straylight/Edgeware From: Mark Wooding Now they're alphabetical by complaint. --- server/tripe-admin.5.in | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/server/tripe-admin.5.in b/server/tripe-admin.5.in index bd0635e5..cc97298a 100644 --- a/server/tripe-admin.5.in +++ b/server/tripe-admin.5.in @@ -1468,9 +1468,6 @@ and the second token is the filename of the keyring. Frequently a key tag may be given next, preceded by the token .BR key . .SP -.BI "KEYMGMT private-keyring " file " key " tag " incorrect-public-key" -The private key doesn't record the correct corresponding public key. -.SP .BI "KEYMGMT public-keyring " file " key " tag " algorithm-mismatch" A peer's public key doesn't request the same algorithms as our private key. @@ -1486,13 +1483,21 @@ The key attributes contain .I str where a MAC tag length was expected. The key was generated wrongly. .SP +.BI "KEYMGMT private-keyring " file " key " tag " incorrect-public-key" +The private key doesn't record the correct corresponding public key. +.SP +.BI "KEYMGMT " which "-keyring " file " io-error " ecode " " message +A system error occurred while opening or reading the keyring file. +.SP .BI "KEYMGMT private-keyring " file " key " tag " changed-group" The private keyring has been changed, but the new private key can't be used because it uses a different group for Diffie\(enHellman key exchange. .SP -.BI "KEYMGMT " which "-keyring " file " io-error " ecode " " message -A system error occurred while opening or reading the keyring file. +.BI "KEYMGMT " which "-keyring " file " key " tag " no-hmac-for-hash " hash +No message authentication code was given explicitly, and there's no +implementation of HMAC for the selected hash function +.IR hash . .SP .BI "KEYMGMT " which "-keyring " file " key " tag " unknown-bulk-transform " bulk The key specifies the use of an unknown bulk-crypto transform @@ -1537,10 +1542,6 @@ The key specifies the use of an unknown serialization format for hashing group elements. Maybe the key was generated wrongly, or maybe the version of Catacomb installed is too old. .SP -.BI "KEYMGMT " which "-keyring " file " key " tag " no-hmac-for-hash " hash -No message authentication code was given explicitly, and there's no -implementation of HMAC for the selected hash function -.IR hash . .SP .BI "KEYMGMT " which "-keyring " file " key " tag " " alg " " name " no-key-size " hashsz The -- [mdw]