diff options
| author | Werner Koch <wk@gnupg.org> | 2013-10-01 22:00:50 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-10-01 22:00:50 +0200 |
| commit | 3ca180b25e8df252fc16f802cfdc27496e307830 (patch) | |
| tree | 1399c7891aa6f4bf4bf994adaa078dadd3510091 /cipher/serpent.c | |
| parent | 4153fa859816e799e506055321a22e6450aacdcc (diff) | |
| download | libgcrypt-3ca180b25e8df252fc16f802cfdc27496e307830.tar.gz | |
cipher: Simplify the cipher dispatcher cipher.c.
* src/gcrypt-module.h (gcry_cipher_spec_t): Move to ...
* src/cipher-proto.h (gcry_cipher_spec_t): here. Merge with
cipher_extra_spec_t. Add fields ALGO and FLAGS. Set these fields in
all cipher modules.
* cipher/cipher.c: Change most code to replace the former module
system by a simpler system to gain information about the algorithms.
(disable_pubkey_algo): Simplified. Not anymore thread-safe, though.
* cipher/md.c (_gcry_md_selftest): Use correct structure. Not a real
problem because both define the same function as their first field.
* cipher/pubkey.c (_gcry_pk_selftest): Take care of the disabled flag.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/serpent.c')
| -rw-r--r-- | cipher/serpent.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cipher/serpent.c b/cipher/serpent.c index 4720b9c6..c0898dcd 100644 --- a/cipher/serpent.c +++ b/cipher/serpent.c @@ -1192,6 +1192,7 @@ static const char *cipher_spec_serpent128_aliases[] = gcry_cipher_spec_t _gcry_cipher_spec_serpent128 = { + GCRY_CIPHER_SERPENT128, {0, 0}, "SERPENT128", cipher_spec_serpent128_aliases, NULL, 16, 128, sizeof (serpent_context_t), serpent_setkey, serpent_encrypt, serpent_decrypt @@ -1199,6 +1200,7 @@ gcry_cipher_spec_t _gcry_cipher_spec_serpent128 = gcry_cipher_spec_t _gcry_cipher_spec_serpent192 = { + GCRY_CIPHER_SERPENT192, {0, 0}, "SERPENT192", NULL, NULL, 16, 192, sizeof (serpent_context_t), serpent_setkey, serpent_encrypt, serpent_decrypt @@ -1206,6 +1208,7 @@ gcry_cipher_spec_t _gcry_cipher_spec_serpent192 = gcry_cipher_spec_t _gcry_cipher_spec_serpent256 = { + GCRY_CIPHER_SERPENT256, {0, 0}, "SERPENT256", NULL, NULL, 16, 256, sizeof (serpent_context_t), serpent_setkey, serpent_encrypt, serpent_decrypt |