diff options
| author | Werner Koch <wk@gnupg.org> | 2003-09-23 19:48:33 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2003-09-23 19:48:33 +0200 |
| commit | 4c66e94ff91d680eaf1d9c48a62d66d1951f90ef (patch) | |
| tree | 66ede04edbfe1c45eece46e852093282832f8312 /include | |
| parent | 2003-09-22 Timo Schulz <twoaday@freakmail.de> (diff) | |
| download | gnupg2-4c66e94ff91d680eaf1d9c48a62d66d1951f90ef.tar.xz gnupg2-4c66e94ff91d680eaf1d9c48a62d66d1951f90ef.zip | |
Merged most of David Shaw's changes in 1.3 since 2003-06-03.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 11 | ||||
| -rw-r--r-- | include/cipher.h | 1 | ||||
| -rw-r--r-- | include/types.h | 10 |
3 files changed, 16 insertions, 6 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 380d63b45..5b343f5a0 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,14 @@ +2003-09-04 David Shaw <dshaw@jabberwocky.com> + + * cipher.h: Drop TIGER/192 support. + + * types.h: Prefer using uint64_t when creating a 64-bit unsigned + type. This avoids a warning on compilers that support but complain + about unsigned long long. + + * util.h: Make sure that only ascii is passed to isfoo + functions. (From Werner on stable branch). + 2003-09-04 Werner Koch <wk@gnupg.org> * cipher.h (PUBKEY_USAGE_AUTH): Added. diff --git a/include/cipher.h b/include/cipher.h index 90cedb051..e7e36c6d5 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -53,7 +53,6 @@ #define DIGEST_ALGO_MD5 GCRY_MD_MD5 #define DIGEST_ALGO_SHA1 GCRY_MD_SHA1 #define DIGEST_ALGO_RMD160 GCRY_MD_RMD160 -#define DIGEST_ALGO_TIGER GCRY_MD_TIGER #define DIGEST_ALGO_SHA256 GCRY_MD_SHA256 #define DIGEST_ALGO_SHA384 GCRY_MD_SHA384 #define DIGEST_ALGO_SHA512 GCRY_MD_SHA512 diff --git a/include/types.h b/include/types.h index 838897aa5..dff512061 100644 --- a/include/types.h +++ b/include/types.h @@ -101,7 +101,11 @@ typedef unsigned long u32; */ #ifndef HAVE_U64_TYPEDEF #undef u64 /* maybe there is a macro with this name */ -#if SIZEOF_UNSIGNED_INT == 8 +#if SIZEOF_UINT64_T == 8 +typedef uint64_t u64; +#define U64_C(c) (UINT64_C(c)) +#define HAVE_U64_TYPEDEF +#elif SIZEOF_UNSIGNED_INT == 8 typedef unsigned int u64; #define U64_C(c) (c ## U) #define HAVE_U64_TYPEDEF @@ -113,10 +117,6 @@ typedef unsigned long u64; typedef unsigned long long u64; #define U64_C(c) (c ## ULL) #define HAVE_U64_TYPEDEF -#elif SIZEOF_UINT64_T == 8 -typedef uint64_t u64; -#define U64_C(c) (UINT64_C(c)) -#define HAVE_U64_TYPEDEF #endif #endif |