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/cipher-ctr.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/cipher-ctr.c')
| -rw-r--r-- | cipher/cipher-ctr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cipher/cipher-ctr.c b/cipher/cipher-ctr.c index ff1742c6..fbc898f1 100644 --- a/cipher/cipher-ctr.c +++ b/cipher/cipher-ctr.c @@ -38,7 +38,7 @@ _gcry_cipher_ctr_encrypt (gcry_cipher_hd_t c, { unsigned int n; int i; - unsigned int blocksize = c->cipher->blocksize; + unsigned int blocksize = c->spec->blocksize; unsigned int nblocks; unsigned int burn, nburn; @@ -77,7 +77,7 @@ _gcry_cipher_ctr_encrypt (gcry_cipher_hd_t c, unsigned char tmp[MAX_BLOCKSIZE]; do { - nburn = c->cipher->encrypt (&c->context.c, tmp, c->u_ctr.ctr); + nburn = c->spec->encrypt (&c->context.c, tmp, c->u_ctr.ctr); burn = nburn > burn ? nburn : burn; for (i = blocksize; i > 0; i--) |