security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-21 15:01:41 +02:00
Code Activity

* cipher.h: Make cipher list match 2440bis-09.

Browse Source
This commit is contained in:
David Shaw 2003-12-04 05:24:32 +00:00
parent b5fe8d3dd7
commit 32c198391e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ChangeLog
View File

@ -1,3 +1,7 @@
2003-12-03 David Shaw <dshaw@jabberwocky.com>
* cipher.h: Make cipher list match 2440bis-09.
2003-11-20 David Shaw <dshaw@jabberwocky.com> 2003-11-20 David Shaw <dshaw@jabberwocky.com>
* util.h: Add prototype for match_multistr(). * util.h: Add prototype for match_multistr().

11
include/cipher.h
View File

@ -1,5 +1,5 @@
/* cipher.h /* 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. * This file is part of GNUPG.
* *
@ -31,17 +31,14 @@
#define CIPHER_ALGO_3DES 2 #define CIPHER_ALGO_3DES 2
#define CIPHER_ALGO_CAST5 3 #define CIPHER_ALGO_CAST5 3
#define CIPHER_ALGO_BLOWFISH 4 /* blowfish 128 bit key */ #define CIPHER_ALGO_BLOWFISH 4 /* blowfish 128 bit key */
#define CIPHER_ALGO_SAFER_SK128 5 /* 5 & 6 are reserved */
#define CIPHER_ALGO_DES_SK 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_RIJNDAEL CIPHER_ALGO_AES
#define CIPHER_ALGO_RIJNDAEL192 CIPHER_ALGO_AES192 #define CIPHER_ALGO_RIJNDAEL192 CIPHER_ALGO_AES192
#define CIPHER_ALGO_RIJNDAEL256 CIPHER_ALGO_AES256 #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_SKIPJACK 101 /* experimental: skipjack */
#define CIPHER_ALGO_TWOFISH_OLD 102 /* experimental: twofish 128 bit */
#define CIPHER_ALGO_DUMMY 110 /* no encryption at all */ #define CIPHER_ALGO_DUMMY 110 /* no encryption at all */
#define PUBKEY_ALGO_RSA 1 #define PUBKEY_ALGO_RSA 1
@ -59,6 +56,7 @@
#define DIGEST_ALGO_MD5 1 #define DIGEST_ALGO_MD5 1
#define DIGEST_ALGO_SHA1 2 #define DIGEST_ALGO_SHA1 2
#define DIGEST_ALGO_RMD160 3 #define DIGEST_ALGO_RMD160 3
/* 4, 5, 6, and 7 are reserved */
#define DIGEST_ALGO_SHA256 8 #define DIGEST_ALGO_SHA256 8
#define DIGEST_ALGO_SHA384 9 #define DIGEST_ALGO_SHA384 9
#define DIGEST_ALGO_SHA512 10 #define DIGEST_ALGO_SHA512 10
@ -71,6 +69,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 || (a)==PUBKEY_ALGO_ELGAMAL_E)
#define is_DSA(a) ((a)==PUBKEY_ALGO_DSA)
typedef struct { typedef struct {
int algo; int algo;