security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* armor.c (parse_hash_header, armor_filter): Accept the new SHAs in the

Browse source 
armor Hash: header.

* g10.c (print_hex): Print long hash strings a little neater. (print_mds):
Add the new SHAs to the hash list.
This commit is contained in:
David Shaw 2003-02-04 19:33:09 +00:00
parent cef8bbd91f
commit f523e53d4e
3 changed files with 51 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
g10/g10.c
View file

@ -2694,7 +2694,16 @@ print_hex( byte *p, size_t n )
{
int i;
if( n == 20 ) {
if( n == 16 ) {
for(i=0; i < n ; i++, p++ ) {
if( i )
putchar(' ');
if( i && !(i%8) )
putchar(' ');
printf("%02X", *p );
}
}
else if( n == 20 ) {
for(i=0; i < n ; i++, i++, p += 2 ) {
if( i )
putchar(' ');
@ -2703,24 +2712,15 @@ print_hex( byte *p, size_t n )
printf("%02X%02X", *p, p[1] );
}
}
else if( n == 24 ) {
else {
for(i=0; i < n ; i += 4, p += 4 ) {
if( i )
putchar(' ');
if( i == 12 )
if( i == 12 && n <= 24 )
putchar(' ');
printf("%02X%02X%02X%02X", *p, p[1], p[2], p[3] );
}
}
else {
for(i=0; i < n ; i++, p++ ) {
if( i )
putchar(' ');
if( i && !(i%8) )
putchar(' ');
printf("%02X", *p );
}
}
}
static void
@ -2783,6 +2783,9 @@ print_mds( const char *fname, int algo )
md_enable( md, DIGEST_ALGO_RMD160 );
if( !check_digest_algo(DIGEST_ALGO_TIGER) )
md_enable( md, DIGEST_ALGO_TIGER );
md_enable( md, DIGEST_ALGO_SHA256 );
md_enable( md, DIGEST_ALGO_SHA384 );
md_enable( md, DIGEST_ALGO_SHA512 );
}
while( (n=fread( buf, 1, DIM(buf), fp )) )
@ -2800,6 +2803,9 @@ print_mds( const char *fname, int algo )
print_hashline( md, DIGEST_ALGO_RMD160, fname );
if( !check_digest_algo(DIGEST_ALGO_TIGER) )
print_hashline( md, DIGEST_ALGO_TIGER, fname );
print_hashline( md, DIGEST_ALGO_SHA256, fname );
print_hashline( md, DIGEST_ALGO_SHA384, fname );
print_hashline( md, DIGEST_ALGO_SHA512, fname );
}
}
else {
@ -2818,7 +2824,13 @@ print_mds( const char *fname, int algo )
if( !check_digest_algo(DIGEST_ALGO_TIGER) ) {
printf("\n%s TIGER = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_TIGER), 24 );
}
}
printf("\n%sSHA256 = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_SHA256), 32 );
printf("\n%sSHA384 = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_SHA384), 48 );
printf("\n%sSHA512 = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_SHA512), 64 );
}
putchar('\n');
}