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/des.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/des.c')
| -rw-r--r-- | cipher/des.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cipher/des.c b/cipher/des.c index d9acaaf5..a38b4f46 100644 --- a/cipher/des.c +++ b/cipher/des.c @@ -991,7 +991,7 @@ selftest (void) } -static gpg_err_code_t +static gcry_err_code_t do_tripledes_setkey ( void *context, const byte *key, unsigned keylen ) { struct _tripledes_ctx *ctx = (struct _tripledes_ctx *) context; @@ -1028,7 +1028,7 @@ do_tripledes_decrypt( void *context, byte *outbuf, const byte *inbuf ) _gcry_burn_stack (32); } -static gpg_err_code_t +static gcry_err_code_t do_des_setkey (void *context, const byte *key, unsigned keylen) { struct _des_ctx *ctx = (struct _des_ctx *) context; @@ -1068,12 +1068,12 @@ do_des_decrypt( void *context, byte *outbuf, const byte *inbuf ) gcry_cipher_spec_t cipher_spec_des = { - "DES", 8, 64, sizeof (struct _des_ctx), + "DES", NULL, 8, 64, sizeof (struct _des_ctx), do_des_setkey, do_des_encrypt, do_des_decrypt }; gcry_cipher_spec_t cipher_spec_tripledes = { - "3DES", 8, 192, sizeof (struct _tripledes_ctx), + "3DES", NULL, 8, 192, sizeof (struct _tripledes_ctx), do_tripledes_setkey, do_tripledes_encrypt, do_tripledes_decrypt }; |