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-aeswrap.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-aeswrap.c')
| -rw-r--r-- | cipher/cipher-aeswrap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cipher/cipher-aeswrap.c b/cipher/cipher-aeswrap.c index 931dec10..03b0ea78 100644 --- a/cipher/cipher-aeswrap.c +++ b/cipher/cipher-aeswrap.c @@ -48,7 +48,7 @@ _gcry_cipher_aeswrap_encrypt (gcry_cipher_hd_t c, #error Invalid block size #endif /* We require a cipher with a 128 bit block length. */ - if (c->cipher->blocksize != 16) + if (c->spec->blocksize != 16) return GPG_ERR_INV_LENGTH; /* The output buffer must be able to hold the input data plus one @@ -90,7 +90,7 @@ _gcry_cipher_aeswrap_encrypt (gcry_cipher_hd_t c, /* B := AES_k( A | R[i] ) */ memcpy (b, a, 8); memcpy (b+8, r+i*8, 8); - nburn = c->cipher->encrypt (&c->context.c, b, b); + nburn = c->spec->encrypt (&c->context.c, b, b); burn = nburn > burn ? nburn : burn; /* t := t + 1 */ for (x = 7; x >= 0; x--) @@ -130,7 +130,7 @@ _gcry_cipher_aeswrap_decrypt (gcry_cipher_hd_t c, #error Invalid block size #endif /* We require a cipher with a 128 bit block length. */ - if (c->cipher->blocksize != 16) + if (c->spec->blocksize != 16) return GPG_ERR_INV_LENGTH; /* The output buffer must be able to hold the input data minus one @@ -173,7 +173,7 @@ _gcry_cipher_aeswrap_decrypt (gcry_cipher_hd_t c, /* B := AES_k^1( (A ^ t)| R[i] ) */ buf_xor(b, a, t, 8); memcpy (b+8, r+(i-1)*8, 8); - nburn = c->cipher->decrypt (&c->context.c, b, b); + nburn = c->spec->decrypt (&c->context.c, b, b); burn = nburn > burn ? nburn : burn; /* t := t - 1 */ for (x = 7; x >= 0; x--) |