mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* g10.c (print_mds): Check that SHA384 and 512 are available before using
them as they are no longer always available. * exec.c (set_exec_path): Add debugging line. * Makefile.am: Use the more correct @PACKAGE@ rather than "gnupg".
This commit is contained in:
parent
ff8406b3d8
commit
4eafcfb13b
4 changed files with 25 additions and 7 deletions
18
g10/g10.c
18
g10/g10.c
|
@ -2709,8 +2709,10 @@ print_mds( const char *fname, int algo )
|
|||
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 );
|
||||
if( !check_digest_algo(DIGEST_ALGO_SHA384) )
|
||||
md_enable( md, DIGEST_ALGO_SHA384 );
|
||||
if( !check_digest_algo(DIGEST_ALGO_SHA512) )
|
||||
md_enable( md, DIGEST_ALGO_SHA512 );
|
||||
}
|
||||
|
||||
while( (n=fread( buf, 1, DIM(buf), fp )) )
|
||||
|
@ -2729,8 +2731,10 @@ print_mds( const char *fname, int algo )
|
|||
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 );
|
||||
if( !check_digest_algo(DIGEST_ALGO_SHA384) )
|
||||
print_hashline( md, DIGEST_ALGO_SHA384, fname );
|
||||
if( !check_digest_algo(DIGEST_ALGO_SHA512) )
|
||||
print_hashline( md, DIGEST_ALGO_SHA512, fname );
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
@ -2743,8 +2747,10 @@ print_mds( const char *fname, int algo )
|
|||
if( !check_digest_algo(DIGEST_ALGO_TIGER) )
|
||||
print_hex( md, DIGEST_ALGO_TIGER, fname );
|
||||
print_hex( md, DIGEST_ALGO_SHA256, fname );
|
||||
print_hex( md, DIGEST_ALGO_SHA384, fname );
|
||||
print_hex( md, DIGEST_ALGO_SHA512, fname );
|
||||
if( !check_digest_algo(DIGEST_ALGO_SHA384) )
|
||||
print_hex( md, DIGEST_ALGO_SHA384, fname );
|
||||
if( !check_digest_algo(DIGEST_ALGO_SHA512) )
|
||||
print_hex( md, DIGEST_ALGO_SHA512, fname );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue