From: Mark Wooding Date: Mon, 20 Jul 2015 12:53:44 +0000 (+0100) Subject: Merge branch 'mdw/latin-dances' X-Git-Tag: 2.2.0~1 X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/290ddb617fe530512a3496de61318a98ae623fe7 Merge branch 'mdw/latin-dances' * mdw/latin-dances: progs/rspit.c: Include Salsa20 and ChaCha (and their variants). symm: Implement Bernstein's ChaCha stream cipher. symm: Implement Bernstein's Salsa20 stream cipher and its variants. --- 290ddb617fe530512a3496de61318a98ae623fe7