diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2013-09-05 13:42:11 +0400 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-09-07 10:26:31 +0200 |
| commit | ae6f6c47d2e0c536f3eab0823b5f23d26956cda2 (patch) | |
| tree | ec202a360d6891f859ff69a6ea39e9153facfd49 /src/cipher.h | |
| parent | 49d5b9dcd622cdc87fb02a211bd51e3d46345bf2 (diff) | |
| download | libgcrypt-ae6f6c47d2e0c536f3eab0823b5f23d26956cda2.tar.gz | |
Add support for Salsa20/12 - 12 round version of Salsa20
* src/gcrypt.h.in (GCRY_CIPHER_SALSA20R12): New.
* src/salsa20.c (salsa20_core, salsa20_do_encrypt_stream): Add support
for reduced round versions.
(salsa20r12_encrypt_stream, _gcry_cipher_spec_salsa20r12): Implement
Salsa20/12 - a 12 round version of Salsa20 selected by eStream.
* src/cipher.h: Declsare Salsa20/12 definition.
* cipher/cipher.c: Register Salsa20/12
* tests/basic.c: (check_stream_cipher, check_stream_cipher_large_block):
Populate Salsa20/12 tests with test vectors from ecrypt
(check_ciphers): Add simple test for Salsa20/12
--
Salsa20/12 is a reduced round version of Salsa20 that is amongst ciphers
selected by eSTREAM for Phase 3 of Profile 1 algorithm. Moreover it is
one of proposed ciphers for TLS (draft-josefsson-salsa20-tls-02).
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'src/cipher.h')
| -rw-r--r-- | src/cipher.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cipher.h b/src/cipher.h index 3674c2dd..ea8ba2af 100644 --- a/src/cipher.h +++ b/src/cipher.h @@ -197,6 +197,7 @@ extern gcry_cipher_spec_t _gcry_cipher_spec_camellia192; extern gcry_cipher_spec_t _gcry_cipher_spec_camellia256; extern gcry_cipher_spec_t _gcry_cipher_spec_idea; extern gcry_cipher_spec_t _gcry_cipher_spec_salsa20; +extern gcry_cipher_spec_t _gcry_cipher_spec_salsa20r12; extern cipher_extra_spec_t _gcry_cipher_extraspec_tripledes; extern cipher_extra_spec_t _gcry_cipher_extraspec_aes; |