diff options
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/cipher.h | 15 | ||||
| -rw-r--r-- | src/gcrypt.h | 2 | ||||
| -rw-r--r-- | src/global.c | 4 | ||||
| -rw-r--r-- | src/stdmem.c | 2 |
5 files changed, 26 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4f8f0a68..1018d2ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2002-07-25 Werner Koch <wk@gnupg.org> + + * cipher.h: Added prototypes for progress functions. + * global.c: Include cipher.h for those prototypes. + + * stdmem.c (_gcry_private_realloc): Replaced void* by char * for + pointer arithmetic reasons. Noted by Stephan Austermuehle. + 2002-06-24 Werner Koch <wk@gnupg.org> * missing-string.c: Include ctype.h. diff --git a/src/cipher.h b/src/cipher.h index c857be70..e97c3686 100644 --- a/src/cipher.h +++ b/src/cipher.h @@ -67,5 +67,20 @@ void _gcry_rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length ) /*-- smallprime.c --*/ extern ushort small_prime_numbers[]; +/*-- dsa.c --*/ +void _gcry_register_pk_dsa_progress (void (*cb)(void *,const char *, + int,int,int), + void *cb_data ); +/*-- elgamal.c --*/ +void _gcry_register_pk_elg_progress (void (*cb)(void *,const char *, + int,int,int), + void *cb_data ); +/*-- primegen.c --*/ +void _gcry_register_primegen_progress (void (*cb)(void *,const char *, + int,int,int), + void *cb_data ); + + #endif /*G10_CIPHER_H*/ + diff --git a/src/gcrypt.h b/src/gcrypt.h index 7f8e955b..66a43357 100644 --- a/src/gcrypt.h +++ b/src/gcrypt.h @@ -180,7 +180,7 @@ enum gcry_sexp_format { GCRYSEXP_FMT_ADVANCED = 3 }; -/* Create an new S-expression object from BUFFER of size LENGTH aand +/* Create an new S-expression object from BUFFER of size LENGTH and return it in RETSEXP. With AUTODETECT set to 0 the data in BUFFER is expected to be in canonized format */ int gcry_sexp_new (GcrySexp *retsexp, const void *buffer, size_t length, diff --git a/src/global.c b/src/global.c index dd618691..35a62654 100644 --- a/src/global.c +++ b/src/global.c @@ -27,7 +27,7 @@ #include <assert.h> #include "g10lib.h" -#include "../cipher/random.h" +#include "cipher.h" #include "stdmem.h" /* our own memory allocator */ #include "secmem.h" /* our own secmem allocator */ @@ -551,5 +551,3 @@ gcry_set_progress_handler (void (*cb)(void *,const char*,int, int, int), _gcry_register_pk_elg_progress (cb, cb_data); _gcry_register_primegen_progress (cb, cb_data); } - - diff --git a/src/stdmem.c b/src/stdmem.c index 113eabc1..b5ddfcce 100644 --- a/src/stdmem.c +++ b/src/stdmem.c @@ -116,7 +116,7 @@ _gcry_private_realloc( void *a, size_t n ) { if( use_m_guard ) { unsigned char *p = a; - void *b; + char *b; size_t len; if (!a) |