diff options
author | Werner Koch <wk@gnupg.org> | 2013-07-18 21:32:05 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-07-18 21:32:05 +0200 |
commit | c4885092088431e7928e4459fda20cc0e8ceb201 (patch) | |
tree | 3282d123480be1f0cbdc3e92832f91ac26ae9a0d /src/cipher.h | |
parent | f6d6e0200fa823d377a342efacaf3d61e4303dc3 (diff) | |
download | libgcrypt-c4885092088431e7928e4459fda20cc0e8ceb201.tar.gz |
Add support for Salsa20.
* src/gcrypt.h.in (GCRY_CIPHER_SALSA20): New.
* cipher/salsa20.c: New.
* configure.ac (available_ciphers): Add Salsa20.
* cipher/cipher.c: Register Salsa20.
(cipher_setiv): Allow to divert an IV to a cipher module.
* src/cipher-proto.h (cipher_setiv_func_t): New.
(cipher_extra_spec): Add field setiv.
* src/cipher.h: Declare Salsa20 definitions.
* tests/basic.c (check_stream_cipher): New.
(check_stream_cipher_large_block): New.
(check_cipher_modes): Run new test functions.
(check_ciphers): Add simple test for Salsa20.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/cipher.h')
-rw-r--r-- | src/cipher.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cipher.h b/src/cipher.h index 26206135..bb927582 100644 --- a/src/cipher.h +++ b/src/cipher.h @@ -27,6 +27,7 @@ #include "../random/random.h" #define PUBKEY_FLAG_NO_BLINDING (1 << 0) +#define PUBKEY_FLAG_RFC6979 (1 << 1) enum pk_operation { @@ -194,12 +195,13 @@ extern gcry_cipher_spec_t _gcry_cipher_spec_camellia128; 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 cipher_extra_spec_t _gcry_cipher_extraspec_tripledes; extern cipher_extra_spec_t _gcry_cipher_extraspec_aes; extern cipher_extra_spec_t _gcry_cipher_extraspec_aes192; extern cipher_extra_spec_t _gcry_cipher_extraspec_aes256; - +extern cipher_extra_spec_t _gcry_cipher_extraspec_salsa20; /* Declarations for the digest specifications. */ extern gcry_md_spec_t _gcry_digest_spec_crc32; |