diff options
| author | Werner Koch <[email protected]> | 2008-09-29 15:02:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2008-09-29 15:02:55 +0000 |
| commit | 7d63aa42e5d2c086810e3d7eca64a01f366b4e88 (patch) | |
| tree | 7dccaebaa7f86d56fef8beb00eb9c2bc583ede20 /g10/gpg.c | |
| parent | 2008-09-28 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.tar.gz gnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.zip | |
Remove hacks which are not anymore needed since we now require Libgcrypt 1.4
Diffstat (limited to '')
| -rw-r--r-- | g10/gpg.c | 23 |
1 files changed, 7 insertions, 16 deletions
@@ -1,6 +1,6 @@ /* gpg.c - The GnuPG utility (main for gpg) * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - * 2006, 2007 Free Software Foundation, Inc. + * 2006, 2007, 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -3285,15 +3285,6 @@ main (int argc, char **argv) set_cmd( &cmd, aListKeys); } - /* kludge to let -sat generate a clear text signature */ - if( opt.textmode == 2 && !detached_sig && opt.armor && cmd == aSign ) - { - log_info ("compatibility note:\n"); - log_info ("\"-sat\" won't generate clear signed messages in " - "future versions\n"); - log_info ("Use \"--clearsign\" instead of \"-sat\"\n"); - cmd = aClearsign; - } if( opt.verbose > 1 ) set_packet_list_mode(1); @@ -4155,8 +4146,8 @@ print_mds( const char *fname, int algo ) gcry_md_enable (md, GCRY_MD_MD5); gcry_md_enable (md, GCRY_MD_SHA1); gcry_md_enable (md, GCRY_MD_RMD160); - if (!openpgp_md_test_algo (DIGEST_ALGO_SHA224)) - gcry_md_enable (md, DIGEST_ALGO_SHA224); + if (!openpgp_md_test_algo (GCRY_MD_SHA224)) + gcry_md_enable (md, GCRY_MD_SHA224); if (!openpgp_md_test_algo (GCRY_MD_SHA256)) gcry_md_enable (md, GCRY_MD_SHA256); if (!openpgp_md_test_algo (GCRY_MD_SHA384)) @@ -4178,8 +4169,8 @@ print_mds( const char *fname, int algo ) print_hashline( md, GCRY_MD_MD5, fname ); print_hashline( md, GCRY_MD_SHA1, fname ); print_hashline( md, GCRY_MD_RMD160, fname ); - if (!gcry_md_test_algo (DIGEST_ALGO_SHA224)) - print_hashline (md, DIGEST_ALGO_SHA224, fname); + if (!gcry_md_test_algo (GCRY_MD_SHA224)) + print_hashline (md, GCRY_MD_SHA224, fname); if (!gcry_md_test_algo (GCRY_MD_SHA256)) print_hashline( md, GCRY_MD_SHA256, fname ); if (!gcry_md_test_algo (GCRY_MD_SHA384)) @@ -4195,8 +4186,8 @@ print_mds( const char *fname, int algo ) print_hex( md, GCRY_MD_MD5, fname ); print_hex( md, GCRY_MD_SHA1, fname ); print_hex( md, GCRY_MD_RMD160, fname ); - if (!gcry_md_test_algo (DIGEST_ALGO_SHA224)) - print_hex (md, DIGEST_ALGO_SHA224, fname); + if (!gcry_md_test_algo (GCRY_MD_SHA224)) + print_hex (md, GCRY_MD_SHA224, fname); if (!gcry_md_test_algo (GCRY_MD_SHA256)) print_hex( md, GCRY_MD_SHA256, fname ); if (!gcry_md_test_algo (GCRY_MD_SHA384)) |