diff options
| author | Werner Koch <[email protected]> | 2011-02-03 15:39:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-02-03 15:39:03 +0000 |
| commit | 38904b697c4d27a70281149c6070e6dfca4e893b (patch) | |
| tree | 72ae98a01f64dbe2df74d9687faba0c97159d799 /g10/gpg.c | |
| parent | Add gitattributes (diff) | |
| parent | Finished ECC integration. (diff) | |
| download | gnupg-38904b697c4d27a70281149c6070e6dfca4e893b.tar.gz gnupg-38904b697c4d27a70281149c6070e6dfca4e893b.zip | |
Merge branch 'ECC-INTEGRATION-2-1'ecc-integration-done
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -858,7 +858,7 @@ my_strusage( int level ) case 34: if (!pubkeys) pubkeys = build_list (_("Pubkey: "), 0, - gcry_pk_algo_name, + openpgp_pk_algo_name, openpgp_pk_test_algo ); p = pubkeys; break; @@ -1959,6 +1959,9 @@ main (int argc, char **argv) NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) ); } + /* Use our own logging handler for Libcgrypt. */ + setup_libgcrypt_logging (); + /* Put random number into secure memory */ gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); |