From e399da2ed0492d57ee0fe266c4ae01dae68e3dd6 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 2 Dec 2003 05:24:55 +0000 Subject: [PATCH] * cipher.h: Make cipher list match 2440bis-09. --- include/ChangeLog | 4 ++++ include/cipher.h | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 8882a946a..06fa7a023 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2003-12-02 David Shaw + + * cipher.h: Make cipher list match 2440bis-09. + 2003-11-20 David Shaw * util.h: Add prototype for match_multistr(). diff --git a/include/cipher.h b/include/cipher.h index 03b2f2c80..1bec64c92 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -1,5 +1,5 @@ /* cipher.h - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -31,17 +31,14 @@ #define CIPHER_ALGO_3DES 2 #define CIPHER_ALGO_CAST5 3 #define CIPHER_ALGO_BLOWFISH 4 /* blowfish 128 bit key */ -#define CIPHER_ALGO_SAFER_SK128 5 -#define CIPHER_ALGO_DES_SK 6 +/* 5 & 6 are reserved */ #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_SKIPJACK 101 /* experimental: skipjack */ -#define CIPHER_ALGO_TWOFISH_OLD 102 /* experimental: twofish 128 bit */ +#define CIPHER_ALGO_TWOFISH 10 /* twofish 256 bit */ #define CIPHER_ALGO_DUMMY 110 /* no encryption at all */ #define PUBKEY_ALGO_RSA 1 @@ -58,6 +55,7 @@ #define DIGEST_ALGO_MD5 1 #define DIGEST_ALGO_SHA1 2 #define DIGEST_ALGO_RMD160 3 +/* 4, 5, 6, and 7 are reserved */ #define DIGEST_ALGO_TIGER 6 #define DIGEST_ALGO_SHA256 8 #define DIGEST_ALGO_SHA384 9