diff options
| author | David Shaw <[email protected]> | 2009-06-05 14:11:03 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2009-06-05 14:11:03 +0000 |
| commit | 047d97e95e1df831d699fb77cd58c269a13a5c5c (patch) | |
| tree | 1aba8b3a366cbf6bfe543401009358b079ef3673 /g10/passphrase.c | |
| parent | * defs.inc: Improved all_cipher_algos and all_hash_algos to work when (diff) | |
| download | gnupg-047d97e95e1df831d699fb77cd58c269a13a5c5c.tar.gz gnupg-047d97e95e1df831d699fb77cd58c269a13a5c5c.zip | |
Add full Camellia support.
* configure.ac: Remove Camellia restriction.
* gpg.c (main), misc.c (openpgp_cipher_test_algo): Remove Camellia
restriction.
* misc.c (map_cipher_openpgp_to_gcry), main.h: Add macros for
openpgp_cipher_open, openpgp_cipher_get_algo_keylen, and
openpgp_cipher_get_algo_blklen to wrap around the corresponding gcry_*
functions, but pass the algorithm number through
map_cipher_openpgp_to_gcry. This is needed in case the gcry algorithm
number doesn't match the OpenPGP number (c.f. Camellia).
* encr-data.c, pubkey-enc.c, mainproc.c, cipher.c, encode.c, seskey.c,
passphrase.c, seckey-cert.c: Use new openpgp_cipher_* macros here.
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 84eedc211..3742738e9 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1,6 +1,6 @@ /* passphrase.c - Get a passphrase * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, - * 2005, 2006, 2007 Free Software Foundation, Inc. + * 2005, 2006, 2007, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -61,7 +61,7 @@ hash_passphrase ( DEK *dek, char *pw, STRING2KEY *s2k) int pwlen = strlen(pw); assert ( s2k->hash_algo ); - dek->keylen = gcry_cipher_get_algo_keylen (dek->algo); + dek->keylen = openpgp_cipher_get_algo_keylen (dek->algo); if ( !(dek->keylen > 0 && dek->keylen <= DIM(dek->key)) ) BUG(); |