diff options
| author | Werner Koch <[email protected]> | 2003-12-16 16:31:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-12-16 16:31:16 +0000 |
| commit | a41d45af627c7d9cc66d581ea18521a73fc2660e (patch) | |
| tree | 7bb07d5f57e6c0e1af4b286211f8144508bddab1 /sm/gpgsm.c | |
| parent | (main): Set the prefixes for assuan logging. (diff) | |
| download | gnupg-a41d45af627c7d9cc66d581ea18521a73fc2660e.tar.gz gnupg-a41d45af627c7d9cc66d581ea18521a73fc2660e.zip | |
* gpgsm.c (main): Set the prefixes for assuan logging.
* sign.c (gpgsm_sign): Add validation checks for the default
certificate.
* gpgsm.c: Add -k as alias for --list-keys and -K for
--list-secret-keys.
Diffstat (limited to '')
| -rw-r--r-- | sm/gpgsm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index d3180adee..95f61132d 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -44,7 +44,8 @@ enum cmd_and_opt_values { aDecrypt = 'd', aEncr = 'e', oInteractive = 'i', - oKOption = 'k', + aListKeys = 'k', + aListSecretKeys = 'K', oDryRun = 'n', oOutput = 'o', oQuiet = 'q', @@ -68,10 +69,8 @@ enum cmd_and_opt_values { aImport, aVerify, aVerifyFiles, - aListKeys, aListExternalKeys, aListSigs, - aListSecretKeys, aSendKeys, aRecvKeys, aExport, @@ -695,7 +694,11 @@ main ( int argc, char **argv) */ ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free ); + assuan_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free); + assuan_set_assuan_log_stream (log_get_stream ()); + assuan_set_assuan_log_prefix (log_get_prefix (NULL)); + keybox_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free); /* Setup a default control structure for command line mode */ |