diff options
| author | David Shaw <[email protected]> | 2003-09-04 12:03:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-09-04 12:03:04 +0000 |
| commit | fe0de7bcaabe02894c717d2ff4ae5e3621e06f03 (patch) | |
| tree | 1d9b8465f5ee17dedc81b729e51e3f7a10e37e33 | |
| parent | * md.c (string_to_digest_algo): Enable read-write SHA-256 support. (diff) | |
| download | gnupg-fe0de7bcaabe02894c717d2ff4ae5e3621e06f03.tar.gz gnupg-fe0de7bcaabe02894c717d2ff4ae5e3621e06f03.zip | |
* armor.c (parse_hash_header, armor_filter), g10.c (print_hex, print_mds),
pkclist.c (algo_available): Drop TIGER/192 support.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/armor.c | 16 | ||||
| -rw-r--r-- | g10/g10.c | 11 | ||||
| -rw-r--r-- | g10/pkclist.c | 4 |
4 files changed, 10 insertions, 26 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 19bb82148..e2e8d5b8b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2003-09-04 David Shaw <[email protected]> + + * armor.c (parse_hash_header, armor_filter), g10.c (print_hex, + print_mds), pkclist.c (algo_available): Drop TIGER/192 support. + 2003-09-03 David Shaw <[email protected]> * keyedit.c (show_key_with_all_names): Fix assertion failure when diff --git a/g10/armor.c b/g10/armor.c index f00742295..89d267294 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -248,16 +248,12 @@ parse_hash_header( const char *line ) found |= 2; else if( !strncmp( s, "MD5", s2-s ) ) found |= 4; - else if( !strncmp( s, "TIGER192", s2-s ) ) - found |= 8; - else if( !strncmp( s, "TIGER", s2-s ) ) /* used by old versions */ - found |= 8; else if( !strncmp( s, "SHA256", s2-s ) ) - found |= 16; + found |= 8; else if( !strncmp( s, "SHA384", s2-s ) ) - found |= 32; + found |= 16; else if( !strncmp( s, "SHA512", s2-s ) ) - found |= 64; + found |= 32; else return 0; for(; *s2 && (*s2==' ' || *s2 == '\t'); s2++ ) @@ -898,12 +894,10 @@ armor_filter( void *opaque, int control, if( hashes & 4 ) buf[n++] = DIGEST_ALGO_MD5; if( hashes & 8 ) - buf[n++] = DIGEST_ALGO_TIGER; - if( hashes & 16 ) buf[n++] = DIGEST_ALGO_SHA256; - if( hashes & 32 ) + if( hashes & 16 ) buf[n++] = DIGEST_ALGO_SHA384; - if( hashes & 64 ) + if( hashes & 32 ) buf[n++] = DIGEST_ALGO_SHA512; buf[1] = n - 2; @@ -2867,8 +2867,6 @@ print_hex( MD_HANDLE md, int algo, const char *fname ) if(algo==DIGEST_ALGO_RMD160) indent+=printf("RMD160 = "); - else if(algo==DIGEST_ALGO_TIGER) - indent+=printf(" TIGER = "); else if(algo>0) indent+=printf("%6s = ",digest_algo_to_string(algo)); else @@ -2985,9 +2983,6 @@ print_mds( const char *fname, int algo ) md_enable( md, DIGEST_ALGO_MD5 ); md_enable( md, DIGEST_ALGO_SHA1 ); md_enable( md, DIGEST_ALGO_RMD160 ); -#ifdef USE_TIGER192 - md_enable( md, DIGEST_ALGO_TIGER ); -#endif #ifdef USE_SHA256 md_enable( md, DIGEST_ALGO_SHA256 ); #endif @@ -3010,9 +3005,6 @@ print_mds( const char *fname, int algo ) print_hashline( md, DIGEST_ALGO_MD5, fname ); print_hashline( md, DIGEST_ALGO_SHA1, fname ); print_hashline( md, DIGEST_ALGO_RMD160, fname ); -#ifdef USE_TIGER192 - print_hashline( md, DIGEST_ALGO_TIGER, fname ); -#endif #ifdef USE_SHA256 print_hashline( md, DIGEST_ALGO_SHA256, fname ); #endif @@ -3029,9 +3021,6 @@ print_mds( const char *fname, int algo ) print_hex( md, DIGEST_ALGO_MD5, fname ); print_hex( md, DIGEST_ALGO_SHA1, fname ); print_hex( md, DIGEST_ALGO_RMD160, fname ); -#ifdef USE_TIGER192 - print_hex( md, DIGEST_ALGO_TIGER, fname ); -#endif #ifdef USE_SHA256 print_hex( md, DIGEST_ALGO_SHA256, fname ); #endif diff --git a/g10/pkclist.c b/g10/pkclist.c index e6c826963..0a94a259f 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1164,10 +1164,6 @@ algo_available( preftype_t preftype, int algo, void *hint ) && algo != DIGEST_ALGO_SHA256)) return 0; - /* TIGER is not allowed any longer according to 2440bis. */ - if( RFC2440 && algo == DIGEST_ALGO_TIGER ) - return 0; - return algo && !check_digest_algo( algo ); } else if( preftype == PREFTYPE_ZIP ) |