diff options
| author | Werner Koch <[email protected]> | 1999-02-10 16:22:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1999-02-10 16:22:40 +0000 |
| commit | 9a4f506a18ed04f5dbd69d74ec0c35ade79e357a (patch) | |
| tree | 07178f77cb23862b045b0edf8a2bc5ce188432cd /include | |
| parent | See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch (diff) | |
| download | gnupg-9a4f506a18ed04f5dbd69d74ec0c35ade79e357a.tar.gz gnupg-9a4f506a18ed04f5dbd69d74ec0c35ade79e357a.zip | |
See ChangeLog: Wed Feb 10 17:15:39 CET 1999 Werner Koch
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/cipher.h | 15 | ||||
| -rw-r--r-- | include/util.h | 8 |
3 files changed, 15 insertions, 13 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index bfe4dfe98..7f7045738 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 10 17:15:39 CET 1999 Werner Koch <[email protected]> + + * cipher.h (CIPHER_ALGO_TWOFISH): Chnaged ID to 10 and renamed + the old experimenatl algorithm to xx_OLD. + Thu Jan 7 18:00:58 CET 1999 Werner Koch <[email protected]> * cipher.h (MD_BUFFER_SIZE): Removed. 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; diff --git a/include/util.h b/include/util.h index 8b8df37e8..6462ddeae 100644 --- a/include/util.h +++ b/include/util.h @@ -127,10 +127,12 @@ const char *strusage( int level ); /*-- dotlock.c --*/ -const char *make_dotlock( const char *file_to_lock, long timeout ); -int release_dotlock( const char *lockfile ); - +struct dotlock_handle; +typedef struct dotlock_handle *DOTLOCK; +DOTLOCK create_dotlock( const char *file_to_lock ); +int make_dotlock( DOTLOCK h, long timeout ); +int release_dotlock( DOTLOCK h ); /*-- fileutil.c --*/ |