diff options
| author | Werner Koch <[email protected]> | 2014-01-31 14:33:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-01-31 14:33:03 +0000 |
| commit | bf50604a0d50b974c1d4b8ccf5d774489f996cae (patch) | |
| tree | 98727debd304abd9e1eec56fe738200fc0053984 /g10/main.h | |
| parent | gpg: Use only OpenPGP cipher algo ids. (diff) | |
| download | gnupg-bf50604a0d50b974c1d4b8ccf5d774489f996cae.tar.gz gnupg-bf50604a0d50b974c1d4b8ccf5d774489f996cae.zip | |
gpg: Start using OpenPGP digest algo ids.
* g10/misc.c (print_pubkey_algo_note): Use enum typedef for the arg.
(print_cipher_algo_note): Ditto.
(print_digest_algo_note): Ditto.
(map_md_openpgp_to_gcry): New.
(openpgp_md_test_algo): Rewrite.
(openpgp_md_algo_name): Rewrite to do without Libgcrypt.
* g10/cpr.c (write_status_begin_signing): Remove hardwired list of
algo ranges.
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/g10/main.h b/g10/main.h index 1ee563ea0..28115ca60 100644 --- a/g10/main.h +++ b/g10/main.h @@ -71,9 +71,9 @@ extern int g10_errors_seen; #else void g10_exit(int rc); #endif -void print_pubkey_algo_note( int algo ); -void print_cipher_algo_note( int algo ); -void print_digest_algo_note( int algo ); +void print_pubkey_algo_note (pubkey_algo_t algo); +void print_cipher_algo_note (cipher_algo_t algo); +void print_digest_algo_note (digest_algo_t algo); /*-- armor.c --*/ char *make_radix64_string( const byte *data, size_t len ); @@ -108,7 +108,8 @@ int openpgp_pk_test_algo2 (pubkey_algo_t algo, unsigned int use); int openpgp_pk_algo_usage ( int algo ); const char *openpgp_pk_algo_name (pubkey_algo_t algo); -int openpgp_md_test_algo( int algo ); +enum gcry_md_algos map_md_openpgp_to_gcry (digest_algo_t algo); +int openpgp_md_test_algo (digest_algo_t algo); const char *openpgp_md_algo_name (int algo); struct expando_args |