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/blowfish.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/blowfish.c')
| -rw-r--r-- | cipher/blowfish.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cipher/blowfish.c b/cipher/blowfish.c index 97909a5e..54d54f62 100644 --- a/cipher/blowfish.c +++ b/cipher/blowfish.c @@ -49,7 +49,7 @@ typedef struct { u32 p[BLOWFISH_ROUNDS+2]; } BLOWFISH_context; -static gpg_err_code_t bf_setkey (void *c, const byte *key, unsigned keylen); +static gcry_err_code_t bf_setkey (void *c, const byte *key, unsigned keylen); static void encrypt_block (void *bc, byte *outbuf, const byte *inbuf); static void decrypt_block (void *bc, byte *outbuf, const byte *inbuf); @@ -490,7 +490,7 @@ selftest(void) -static gpg_err_code_t +static gcry_err_code_t do_bf_setkey (BLOWFISH_context *c, const byte *key, unsigned keylen) { int i, j; @@ -574,11 +574,11 @@ do_bf_setkey (BLOWFISH_context *c, const byte *key, unsigned keylen) } -static gpg_err_code_t +static gcry_err_code_t bf_setkey (void *context, const byte *key, unsigned keylen) { BLOWFISH_context *c = (BLOWFISH_context *) context; - gpg_err_code_t rc = do_bf_setkey (c, key, keylen); + gcry_err_code_t rc = do_bf_setkey (c, key, keylen); _gcry_burn_stack (64); return rc; } @@ -587,7 +587,7 @@ bf_setkey (void *context, const byte *key, unsigned keylen) gcry_cipher_spec_t cipher_spec_blowfish = { - "BLOWFISH", BLOWFISH_BLOCKSIZE, 128, + "BLOWFISH", NULL, BLOWFISH_BLOCKSIZE, 128, sizeof (BLOWFISH_context), bf_setkey, encrypt_block, decrypt_block, }; |