summaryrefslogtreecommitdiffstats
path: root/include/cipher.h
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-02-10 17:22:40 +0100
committerWerner Koch <wk@gnupg.org>1999-02-10 17:22:40 +0100
commit9a4f506a18ed04f5dbd69d74ec0c35ade79e357a (patch)
tree07178f77cb23862b045b0edf8a2bc5ce188432cd /include/cipher.h
parentSee ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch (diff)
downloadgnupg2-9a4f506a18ed04f5dbd69d74ec0c35ade79e357a.tar.xz
gnupg2-9a4f506a18ed04f5dbd69d74ec0c35ade79e357a.zip
See ChangeLog: Wed Feb 10 17:15:39 CET 1999 Werner Koch
Diffstat (limited to 'include/cipher.h')
-rw-r--r--include/cipher.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/include/cipher.h b/include/cipher.h
index 9cd5b5f3c..55a566264 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -33,9 +33,10 @@
#define CIPHER_ALGO_BLOWFISH 4 /* blowfish 128 bit key */
#define CIPHER_ALGO_SAFER_SK128 5
#define CIPHER_ALGO_DES_SK 6
+#define CIPHER_ALGO_TWOFISH 10 /* twofish 256 bit */
#define CIPHER_ALGO_BLOWFISH160 42 /* blowfish 160 bit key (not in OpenPGP)*/
#define CIPHER_ALGO_SKIPJACK 101 /* experimental: skipjack */
-#define CIPHER_ALGO_TWOFISH 102 /* experimental: twofish 128 bit */
+#define CIPHER_ALGO_TWOFISH_OLD 102 /* experimental: twofish 128 bit */
#define CIPHER_ALGO_DUMMY 110 /* no encryption at all */
#define PUBKEY_ALGO_RSA 1
@@ -63,11 +64,9 @@ typedef struct {
byte key[24]; /* this is the largest used keylen (3des) */
} DEK;
+struct cipher_handle_s;
typedef struct cipher_handle_s *CIPHER_HANDLE;
-#ifndef DEFINES_CIPHER_HANDLE
-struct cipher_handle_s { char does_not_matter[1]; };
-#endif
#define CIPHER_MODE_ECB 1
#define CIPHER_MODE_CFB 2
@@ -75,6 +74,8 @@ struct cipher_handle_s { char does_not_matter[1]; };
#define CIPHER_MODE_AUTO_CFB 4
#define CIPHER_MODE_DUMMY 5 /* used with algo DUMMY for no encryption */
+struct md_digest_list_s;
+
typedef struct {
int secure;
FILE *debug;
@@ -85,12 +86,6 @@ typedef struct {
} *MD_HANDLE;
-#ifndef DEFINES_MD_HANDLE /* not really the handle but the algorithm list */
-struct md_digest_list_s { char does_not_matter[1]; };
-#endif
-
-
-
int g10c_debug_mode;
int g10_opt_verbose;