diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 17 | ||||
| -rw-r--r-- | include/cipher.h | 4 | ||||
| -rw-r--r-- | include/errors.h | 1 | ||||
| -rw-r--r-- | include/http.h | 5 | ||||
| -rw-r--r-- | include/iobuf.h | 1 | ||||
| -rw-r--r-- | include/ttyio.h | 1 | ||||
| -rw-r--r-- | include/types.h | 7 | ||||
| -rw-r--r-- | include/util.h | 11 |
8 files changed, 46 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index e5c86ce85..aa6971a2b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,20 @@ +2000-03-14 14:03:43 Werner Koch ([email protected]) + + * types.h (HAVE_U64_TYPEDEF): Defined depending on configure test. + +Thu Jan 13 19:31:58 CET 2000 Werner Koch <[email protected]> + + * types.h (HAVE_U64_TYPEDEF): Add a test for _LONGLONG which fixes + this long living SGI bug. Reported by Alec Habig. + +Sat Dec 4 12:30:28 CET 1999 Werner Koch <[email protected]> + + * iobuf.h (IOBUFCTRL_CANCEL): Nww. + +Mon Oct 4 21:23:04 CEST 1999 Werner Koch <[email protected]> + + * errors.h (G10ERR_NOT_PROCESSED): New. + Wed Sep 15 16:22:17 CEST 1999 Werner Koch <[email protected]> diff --git a/include/cipher.h b/include/cipher.h index a3f0eeba2..bf2010fe0 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -168,10 +168,14 @@ int pubkey_verify( int algo, MPI hash, MPI *data, MPI *pkey, extern ushort small_prime_numbers[]; /*-- primegen.c --*/ +void register_primegen_progress ( void (*cb)( void *, int), void *cb_data ); MPI generate_secret_prime( unsigned nbits ); MPI generate_public_prime( unsigned nbits ); MPI generate_elg_prime( int mode, unsigned pbits, unsigned qbits, MPI g, MPI **factors ); +/*-- elsewhere --*/ +void register_pk_dsa_progress ( void (*cb)( void *, int), void *cb_data ); +void register_pk_elg_progress ( void (*cb)( void *, int), void *cb_data ); #endif /*G10_CIPHER_H*/ diff --git a/include/errors.h b/include/errors.h index 247951271..11c97425f 100644 --- a/include/errors.h +++ b/include/errors.h @@ -71,6 +71,7 @@ #define G10ERR_UNKNOWN_HOST 49 #define G10ERR_SELFTEST_FAILED 50 #define G10ERR_NOT_ENCRYPTED 51 +#define G10ERR_NOT_PROCESSED 52 #ifndef HAVE_STRERROR char *strerror( int n ); diff --git a/include/http.h b/include/http.h index 7e6d9d970..5cfd4b396 100644 --- a/include/http.h +++ b/include/http.h @@ -49,6 +49,10 @@ typedef enum { HTTP_REQ_POST = 3 } HTTP_REQ_TYPE; +enum { /* put flag values into an enum, so that gdb can display them */ + HTTP_FLAG_TRY_PROXY = 1 +}; + struct http_context { int initialized; unsigned int status_code; @@ -61,6 +65,7 @@ struct http_context { HTTP_REQ_TYPE req_type; byte *buffer; /* line buffer */ unsigned buffer_size; + unsigned int flags; }; typedef struct http_context *HTTP_HD; diff --git a/include/iobuf.h b/include/iobuf.h index 363b09e5b..e5e9ba94f 100644 --- a/include/iobuf.h +++ b/include/iobuf.h @@ -32,6 +32,7 @@ #define IOBUFCTRL_UNDERFLOW 3 #define IOBUFCTRL_FLUSH 4 #define IOBUFCTRL_DESC 5 +#define IOBUFCTRL_CANCEL 6 #define IOBUFCTRL_USER 16 typedef struct iobuf_struct *IOBUF; diff --git a/include/ttyio.h b/include/ttyio.h index 7992d85e8..3864e2440 100644 --- a/include/ttyio.h +++ b/include/ttyio.h @@ -24,6 +24,7 @@ int tty_batchmode( int onoff ); void tty_printf( const char *fmt, ... ); void tty_print_string( byte *p, size_t n ); void tty_print_utf8_string( byte *p, size_t n ); +void tty_print_utf8_string2( byte *p, size_t n, size_t max_n ); char *tty_get( const char *prompt ); char *tty_get_hidden( const char *prompt ); void tty_kill_prompt(void); diff --git a/include/types.h b/include/types.h index baac2b5c2..a91e89a50 100644 --- a/include/types.h +++ b/include/types.h @@ -83,6 +83,11 @@ #define HAVE_U32_TYPEDEF #endif +/**************** + * Warning: Some systems segfault when this u64 typedef and + * the dummy code in cipher/md.c is not available. Examples are + * Solaris and IRIX. + */ #ifndef HAVE_U64_TYPEDEF #undef u64 /* maybe there is a macro with this name */ #if SIZEOF_UNSIGNED_INT == 8 @@ -91,7 +96,7 @@ #elif SIZEOF_UNSIGNED_LONG == 8 typedef unsigned long u64; #define HAVE_U64_TYPEDEF - #elif __GNUC__ >= 2 || defined(__SUNPRO_C) + #elif SIZEOF_UNSIGNED_LONG_LONG == 8 typedef unsigned long long u64; #define HAVE_U64_TYPEDEF #endif diff --git a/include/util.h b/include/util.h index 8eec982cc..4c475927c 100644 --- a/include/util.h +++ b/include/util.h @@ -65,6 +65,7 @@ void log_set_name( const char *name ); const char *log_get_name(void); void log_set_pid( int pid ); int log_get_errorcount( int clear ); +void log_inc_errorcount(void); void g10_log_hexdump( const char *text, const char *buf, size_t len ); #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ) @@ -131,6 +132,7 @@ const char *strusage( int level ); struct dotlock_handle; typedef struct dotlock_handle *DOTLOCK; +void disable_dotlock(void); DOTLOCK create_dotlock( const char *file_to_lock ); int make_dotlock( DOTLOCK h, long timeout ); int release_dotlock( DOTLOCK h ); @@ -188,6 +190,9 @@ char *stpcpy(char *a,const char *b); #ifndef HAVE_STRLWR char *strlwr(char *a); #endif +#ifndef HAVE_STRCASECMP +int strcasecmp( const char *, const char *b); +#endif #ifndef HAVE_STRTOUL #define strtoul(a,b,c) ((unsigned long)strtol((a),(b),(c))) #endif @@ -198,6 +203,12 @@ char *strlwr(char *a); #define stricmp(a,b) strcasecmp( (a), (b) ) #endif +/*-- w32reg.c --*/ +#ifdef __MINGW32__ +char *read_w32_registry_string( const char *root, + const char *dir, const char *name ); +#endif + /**** other missing stuff ****/ #ifndef HAVE_ATEXIT /* For SunOS */ #define atexit(a) (on_exit((a),0)) |