X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/66ff643c652defc000809488f58db090052ca75e..6a024d24d97cb5d42c0091571735475b849f59f4:/progs/catcrypt.1 diff --git a/progs/catcrypt.1 b/progs/catcrypt.1 index af5e6b3a..6c554408 100644 --- a/progs/catcrypt.1 +++ b/progs/catcrypt.1 @@ -204,6 +204,30 @@ algorithm of the command (see .BR key (1)) to generate the key. +.TP +.B x25519 +This is Bernstein's Curve25519, a fast Diffie-Hellman using a specific +elliptic curve. +Use the +.B x25519 +algorithm of the +.B key add +command +(see +.BR key (1)) +to generate the key. +.TP +.B x448 +This is Hamburg's Curve25519, a strong Diffie-Hellman using a specific +elliptic curve. +Use the +.B x448 +algorithm of the +.B key add +command +(see +.BR key (1)) +to generate the key. .PP The bulk crypto transform is chosen based on the .B bulk @@ -226,6 +250,28 @@ and .B mac attributes. This is the default transform. +.TP +.B naclbox +Use Salsa20 or ChaCha and Poly1305 to secure the bulk data. +This is nearly the same as the NaCl +.B crypto_secretbox +construction, +except that +.B catcrypt +uses Salsa20 or ChaCha rather than XSalsa20, +because it doesn't need the latter's extended nonce. +The +.B cipher +attribute may be set to one of +.BR salsa20 , +.BR salsa20/12 , +.BR salsa20/8 , +.BR chacha20 , +.BR chacha12 , +or +.BR chacha8 ; +the default is +.BR salsa20 . .PP As well as the KEM itself, a number of supporting algorithms are used. These are taken from appropriately named attributes on the key or, @@ -383,6 +429,40 @@ command (see .BR key (1)) to generate the key. .TP +.B ed25519 +This is Bernstein, Duif, Lange, Schwabe, and Yang's Ed25519 algorithm. +More specifically, this is HashEd25519 +using the selected +.B hash +algorithm \(en by default +.BR sha512 . +Use the +.B ed25519 +algorithm of the +.B key add +command +(see +.BR key (1)) +to generate the key. +.TP +.B ed448 +This is Bernstein, Duif, Lange, Schwabe, and Yang's EdDSA algorithm, +using Hamburg's Ed448-Goldilocks elliptic curve, +as specified in RFC8032. +More specifically, this is HashEd448 +using the selected +.B hash +algorithm \(en by default +.BR sha3-512 . +Use the +.B ed448 +algorithm of the +.B key add +command +(see +.BR key (1)) +to generate the key. +.TP .B mac This uses a symmetric message-authentication algorithm rather than a digital signature. The precise message-authentication scheme used is @@ -422,6 +502,14 @@ and .BR eckcdsa , the default hash function is .BR has160 . +For +.BR ed25519 , +the default hash function is +.BR sha512 . +For +.BR ed448 , +the default hash function is +.BR shake256 . .PP Run .B catcrypt show hash