diff options
| author | Moritz Schulte <mo@g10code.com> | 2003-07-14 22:36:44 +0000 |
|---|---|---|
| committer | Moritz Schulte <mo@g10code.com> | 2003-07-14 22:36:44 +0000 |
| commit | a66dbf4c7a0f7c0f6b2fe0378c97605373428154 (patch) | |
| tree | b833792b11097a48fbabed172ce981c57460ce9c /cipher/twofish.c | |
| parent | 88920837676bf80c371ff950670fb2fa7bf58b24 (diff) | |
| download | libgcrypt-a66dbf4c7a0f7c0f6b2fe0378c97605373428154.tar.gz | |
2003-07-14 Moritz Schulte <moritz@g10code.com>
* cipher.c (gcry_cipher_lookup_func_name): Also check the cipher
name aliases, not just the primary name.
(gcry_cipher_map_name): Remove kludge for aliasing Rijndael to
AES.
* arcfour.c, blowfish.c, cast5.c, des.c, twofish.c: Adjust cipher
specification structures.
* rijndael.c (rijndael_names, rijndael192_names,
rijndael256_names): New variables, use them in the cipher
specifications.
* rmd160test.c: Removed file.
* ac.c, arcfour.c, blowfish.c, cast5.c, cipher.c, des.c, dsa.c,
elgamal.c, md.c, pubkey.c, random.c, rijndael.c, rsa.c, twofish.c:
Used gcry_err* wrappers for libgpg symbols.
* primegen.c (gen_prime): Correct the order arguments to
extra_check.
2003-07-12 Moritz Schulte <moritz@g10code.com>
* ac.c: Replaced all public occurences of gpg_error_t with
gcry_error_t.
* cipher.c: Likewise.
* md.c: Likewise.
* pubkey.c: Likewise.
* random.c: Likewise.
* cipher.c: Added support for TWOFISH128.
Diffstat (limited to 'cipher/twofish.c')
| -rw-r--r-- | cipher/twofish.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cipher/twofish.c b/cipher/twofish.c index ac70051e..704c45c5 100644 --- a/cipher/twofish.c +++ b/cipher/twofish.c @@ -563,7 +563,7 @@ static byte calc_sb_tbl[512] = { /* Perform the key setup. Note that this works only with 128- and 256-bit * keys, despite the API that looks like it might support other sizes. */ -static gpg_err_code_t +static gcry_err_code_t do_twofish_setkey (TWOFISH_context *ctx, const byte *key, const unsigned keylen) { int i, j, k; @@ -698,7 +698,7 @@ do_twofish_setkey (TWOFISH_context *ctx, const byte *key, const unsigned keylen) return 0; } -static gpg_err_code_t +static gcry_err_code_t twofish_setkey (void *context, const byte *key, unsigned int keylen) { TWOFISH_context *ctx = (TWOFISH_context *) context; @@ -1021,12 +1021,12 @@ main() gcry_cipher_spec_t cipher_spec_twofish = { - "TWOFISH", 16, 256, sizeof (TWOFISH_context), + "TWOFISH", NULL, 16, 256, sizeof (TWOFISH_context), twofish_setkey, twofish_encrypt, twofish_decrypt, }; gcry_cipher_spec_t cipher_spec_twofish128 = { - "TWOFISH128", 16, 128, sizeof (TWOFISH_context), + "TWOFISH128", NULL, 16, 128, sizeof (TWOFISH_context), twofish_setkey, twofish_encrypt, twofish_decrypt, }; |