security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* cipher.h: Remove the old CIPHER_ALGO_RINJDAEL values. is_ELGAMAL() now

Browse Source 
only matches type 16 and not type 20.
This commit is contained in:
David Shaw 2004-01-17 03:10:09 +00:00
parent 99f6f81769
commit 57c585bc0f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/ChangeLog
View File

@ -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> 2004-01-15 David Shaw <dshaw@jabberwocky.com>
* util.h: Add prototype for print_string2(). * util.h: Add prototype for print_string2().
@ -11,7 +16,7 @@
* util.h [__riscos__]: Removal of unnecessary RISC OS stuff. * 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 * mpi.h (gcry_mpi, mpi_get_opaque, mpi_set_opaque): Make nbits and
the length of an opaque MPI unsigned. 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. 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 This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without 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 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 WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

8
include/cipher.h
View File

@ -1,5 +1,6 @@
/* cipher.h /* 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. * This file is part of GNUPG.
* *
@ -35,9 +36,6 @@
#define CIPHER_ALGO_AES 7 #define CIPHER_ALGO_AES 7
#define CIPHER_ALGO_AES192 8 #define CIPHER_ALGO_AES192 8
#define CIPHER_ALGO_AES256 9 #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_TWOFISH 10 /* twofish 256 bit */
#define CIPHER_ALGO_DUMMY 110 /* no encryption at all */ #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 \ #define is_RSA(a) ((a)==PUBKEY_ALGO_RSA || (a)==PUBKEY_ALGO_RSA_E \
|| (a)==PUBKEY_ALGO_RSA_S ) || (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) #define is_DSA(a) ((a)==PUBKEY_ALGO_DSA)
typedef struct { typedef struct {