diff options
| author | Werner Koch <[email protected]> | 1998-07-08 09:29:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1998-07-08 09:29:43 +0000 |
| commit | 5aed77d1dbd95a8a0be4d579fd023775ddc85223 (patch) | |
| tree | e9b043aa908c90590b4d2f78639fd24b0a2b83c7 /include | |
| parent | Added new key infos (diff) | |
| download | gnupg-5aed77d1dbd95a8a0be4d579fd023775ddc85223.tar.gz gnupg-5aed77d1dbd95a8a0be4d579fd023775ddc85223.zip | |
fixed clearsig stuff
Diffstat (limited to 'include')
| -rw-r--r-- | include/cipher.h | 5 | ||||
| -rw-r--r-- | include/util.h | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/include/cipher.h b/include/cipher.h index cea0a2114..6df44b772 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -44,6 +44,9 @@ #define PUBKEY_ALGO_DSA 17 #define PUBKEY_ALGO_ELGAMAL 20 /* sign and encrypt elgamal */ +#define PUBKEY_USAGE_SIG 1 /* key is good for signatures */ +#define PUBKEY_USAGE_ENC 2 /* key is good for encryption */ + #define DIGEST_ALGO_MD5 1 #define DIGEST_ALGO_SHA1 2 #define DIGEST_ALGO_RMD160 3 @@ -79,9 +82,7 @@ typedef struct { int bufcount; int secure; FILE *debug; - int guard1; struct md_digest_list_s *list; - int guard2; } *MD_HANDLE; diff --git a/include/util.h b/include/util.h index 032f0adfb..f480f48f3 100644 --- a/include/util.h +++ b/include/util.h @@ -72,6 +72,14 @@ void g10_log_mpidump( const char *text, MPI a ); void g10_log_error( const char *fmt, ... ) __attribute__ ((format (printf,1,2))); void g10_log_info( const char *fmt, ... ) __attribute__ ((format (printf,1,2))); void g10_log_debug( const char *fmt, ... ) __attribute__ ((format (printf,1,2))); + void g10_log_fatal_f( const char *fname, const char *fmt, ... ) + __attribute__ ((noreturn, format (printf,2,3))); + void g10_log_error_f( const char *fname, const char *fmt, ... ) + __attribute__ ((format (printf,2,3))); + void g10_log_info_f( const char *fname, const char *fmt, ... ) + __attribute__ ((format (printf,2,3))); + void g10_log_debug_f( const char *fname, const char *fmt, ... ) + __attribute__ ((format (printf,2,3))); #define BUG() g10_log_bug0( __FILE__ , __LINE__, __FUNCTION__ ) #else void g10_log_bug( const char *fmt, ... ); @@ -80,6 +88,10 @@ void g10_log_mpidump( const char *text, MPI a ); void g10_log_error( const char *fmt, ... ); void g10_log_info( const char *fmt, ... ); void g10_log_debug( const char *fmt, ... ); + void g10_log_fatal_f( const char *fname, const char *fmt, ... ); + void g10_log_error_f( const char *fname, const char *fmt, ... ); + void g10_log_info_f( const char *fname, const char *fmt, ... ); + void g10_log_debug_f( const char *fname, const char *fmt, ... ); #define BUG() g10_log_bug0( __FILE__ , __LINE__ ) #endif @@ -91,7 +103,10 @@ void g10_log_mpidump( const char *text, MPI a ); #define log_error g10_log_error #define log_info g10_log_info #define log_debug g10_log_debug - +#define log_fatal_f g10_log_fatal_f +#define log_error_f g10_log_error_f +#define log_info_f g10_log_info_f +#define log_debug_f g10_log_debug_f /*-- errors.c --*/ |