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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 13541bbc..06c0b790 100644 --- a/configure.ac +++ b/configure.ac @@ -184,7 +184,7 @@ LIBGCRYPT_CONFIG_HOST="$host" # Definitions for symmetric ciphers. available_ciphers="arcfour blowfish cast5 des aes twofish serpent rfc2268 seed" -available_ciphers="$available_ciphers camellia idea" +available_ciphers="$available_ciphers camellia idea salsa20" enabled_ciphers="" # Definitions for public-key ciphers. @@ -1356,6 +1356,12 @@ if test "$found" = "1" ; then AC_DEFINE(USE_IDEA, 1, [Defined if this module should be included]) fi +LIST_MEMBER(salsa20, $enabled_ciphers) +if test "$found" = "1" ; then + GCRYPT_CIPHERS="$GCRYPT_CIPHERS salsa20.lo" + AC_DEFINE(USE_SALSA20, 1, [Defined if this module should be included]) +fi + LIST_MEMBER(dsa, $enabled_pubkey_ciphers) if test "$found" = "1" ; then GCRYPT_PUBKEY_CIPHERS="$GCRYPT_PUBKEY_CIPHERS dsa.lo" |