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 /g10/armor.c | |
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.
Diffstat (limited to '')
-rw-r--r-- | g10/armor.c | 16 |
1 files changed, 5 insertions, 11 deletions
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; |