diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-05-24 12:43:24 +0300 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-05-24 12:19:37 +0200 |
| commit | ab8fc70b5f0c396a5bc941267f59166e860b8c5d (patch) | |
| tree | 172654cd923133fab1da3d737353434de6d11f14 /cipher/camellia-glue.c | |
| parent | 6deb0ccdf718a0670f80e6762a3842caf76437d6 (diff) | |
| download | libgcrypt-ab8fc70b5f0c396a5bc941267f59166e860b8c5d.tar.gz | |
cipher-selftest: make selftest work with any block-size
* cipher/cipher-selftest.c (_gcry_selftest_helper_cbc_128)
(_gcry_selftest_helper_cfb_128, _gcry_selftest_helper_ctr_128): Renamed
functions from '<name>_128' to '<name>'.
(_gcry_selftest_helper_cbc, _gcry_selftest_helper_cfb)
(_gcry_selftest_helper_ctr): Make work with different block sizes.
* cipher/cipher-selftest.h (_gcry_selftest_helper_cbc_128)
(_gcry_selftest_helper_cfb_128, _gcry_selftest_helper_ctr_128): Renamed
prototypes from '<name>_128' to '<name>'.
* cipher/camellia-glue.c (selftest_ctr_128, selftest_cfb_128)
(selftest_ctr_128): Change to use new function names.
* cipher/rijndael.c (selftest_ctr_128, selftest_cfb_128)
(selftest_ctr_128): Change to use new function names.
* cipher/serpent.c (selftest_ctr_128, selftest_cfb_128)
(selftest_ctr_128): Change to use new function names.
--
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'cipher/camellia-glue.c')
| -rw-r--r-- | cipher/camellia-glue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cipher/camellia-glue.c b/cipher/camellia-glue.c index f9bbb334..4163e82d 100644 --- a/cipher/camellia-glue.c +++ b/cipher/camellia-glue.c @@ -374,7 +374,7 @@ selftest_ctr_128 (void) const int blocksize = CAMELLIA_BLOCK_SIZE; const int context_size = sizeof(CAMELLIA_context); - return _gcry_selftest_helper_ctr_128("CAMELLIA", &camellia_setkey, + return _gcry_selftest_helper_ctr("CAMELLIA", &camellia_setkey, &camellia_encrypt, &_gcry_camellia_ctr_enc, nblocks, blocksize, context_size); } @@ -388,7 +388,7 @@ selftest_cbc_128 (void) const int blocksize = CAMELLIA_BLOCK_SIZE; const int context_size = sizeof(CAMELLIA_context); - return _gcry_selftest_helper_cbc_128("CAMELLIA", &camellia_setkey, + return _gcry_selftest_helper_cbc("CAMELLIA", &camellia_setkey, &camellia_encrypt, &_gcry_camellia_cbc_dec, nblocks, blocksize, context_size); } @@ -402,7 +402,7 @@ selftest_cfb_128 (void) const int blocksize = CAMELLIA_BLOCK_SIZE; const int context_size = sizeof(CAMELLIA_context); - return _gcry_selftest_helper_cfb_128("CAMELLIA", &camellia_setkey, + return _gcry_selftest_helper_cfb("CAMELLIA", &camellia_setkey, &camellia_encrypt, &_gcry_camellia_cfb_dec, nblocks, blocksize, context_size); } |