diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2004-01-17 04:10:09 +0100 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2004-01-17 04:10:09 +0100 |
| commit | 57c585bc0f0800769f4c2e8365ca95c1b7ae1d71 (patch) | |
| tree | 2f8ec5af5b4799682b4ef2d25d797d6e5f31794c | |
| parent | * cipher.c (setup_cipher_table): May as well call Rijndael AES at this (diff) | |
| download | gnupg2-57c585bc0f0800769f4c2e8365ca95c1b7ae1d71.tar.xz gnupg2-57c585bc0f0800769f4c2e8365ca95c1b7ae1d71.zip | |
* cipher.h: Remove the old CIPHER_ALGO_RINJDAEL values. is_ELGAMAL() now
only matches type 16 and not type 20.
| -rw-r--r-- | include/ChangeLog | 12 | ||||
| -rw-r--r-- | include/cipher.h | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 47961b58a..9b3133f9b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2004-01-16 David Shaw <dshaw@jabberwocky.com> + + * cipher.h: Remove the old CIPHER_ALGO_RINJDAEL values. + is_ELGAMAL() now only matches type 16 and not type 20. + 2004-01-15 David Shaw <dshaw@jabberwocky.com> * util.h: Add prototype for print_string2(). @@ -11,7 +16,7 @@ * util.h [__riscos__]: Removal of unnecessary RISC OS stuff. -2003-12-17 David Shaw <dshaw@localhost.localdomain> +2003-12-17 David Shaw <dshaw@jabberwocky.com> * mpi.h (gcry_mpi, mpi_get_opaque, mpi_set_opaque): Make nbits and the length of an opaque MPI unsigned. @@ -436,7 +441,8 @@ Tue Mar 3 15:11:21 1998 Werner Koch (wk@isil.d.shuttle.de) functions to this header. - Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002, 2003, + 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without @@ -445,5 +451,3 @@ Tue Mar 3 15:11:21 1998 Werner Koch (wk@isil.d.shuttle.de) This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - diff --git a/include/cipher.h b/include/cipher.h index 274242640..d71a088f8 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -1,5 +1,6 @@ /* cipher.h - * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -35,9 +36,6 @@ #define CIPHER_ALGO_AES 7 #define CIPHER_ALGO_AES192 8 #define CIPHER_ALGO_AES256 9 -#define CIPHER_ALGO_RIJNDAEL CIPHER_ALGO_AES -#define CIPHER_ALGO_RIJNDAEL192 CIPHER_ALGO_AES192 -#define CIPHER_ALGO_RIJNDAEL256 CIPHER_ALGO_AES256 #define CIPHER_ALGO_TWOFISH 10 /* twofish 256 bit */ #define CIPHER_ALGO_DUMMY 110 /* no encryption at all */ @@ -68,7 +66,7 @@ #define is_RSA(a) ((a)==PUBKEY_ALGO_RSA || (a)==PUBKEY_ALGO_RSA_E \ || (a)==PUBKEY_ALGO_RSA_S ) -#define is_ELGAMAL(a) ((a)==PUBKEY_ALGO_ELGAMAL || (a)==PUBKEY_ALGO_ELGAMAL_E) +#define is_ELGAMAL(a) ((a)==PUBKEY_ALGO_ELGAMAL_E) #define is_DSA(a) ((a)==PUBKEY_ALGO_DSA) typedef struct { |