diff options
| author | Neal H. Walfield <[email protected]> | 2015-10-21 18:24:27 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-10-23 15:38:15 +0000 |
| commit | 3c4c89cc35280164b509977c5288b0a06d6f530e (patch) | |
| tree | 91fddf58c14f77b316918179648ef6399d6e2a39 | |
| parent | dirmngr: Implement Tor mode for SRV RRs. (diff) | |
| download | gnupg-3c4c89cc35280164b509977c5288b0a06d6f530e.tar.gz gnupg-3c4c89cc35280164b509977c5288b0a06d6f530e.zip | |
gpg: Use the proper type.
* g10/options.h: Include "tofu.h".
(opt.tofu_default_policy): Change type to enum tofu_policy.
* g10/gpgv.c (enum tofu_policy): Don't redeclare.
* g10/test-stubs.c (enum tofu_policy): Likewise.
--
Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/gpgv.c | 5 | ||||
| -rw-r--r-- | g10/options.h | 5 | ||||
| -rw-r--r-- | g10/test-stubs.c | 5 |
3 files changed, 2 insertions, 13 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index 23e761047..1d7dc7419 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -615,11 +615,6 @@ export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options, return gpg_error (GPG_ERR_NOT_IMPLEMENTED); } -enum tofu_policy - { - tofu_policy - }; - gpg_error_t tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id, enum tofu_policy *policy) diff --git a/g10/options.h b/g10/options.h index c1ea9ddd8..0c674e6a5 100644 --- a/g10/options.h +++ b/g10/options.h @@ -24,6 +24,7 @@ #include <types.h> #include "main.h" #include "packet.h" +#include "tofu.h" #include "../common/session-env.h" #ifndef EXTERN_UNLESS_MAIN_MODULE @@ -125,9 +126,7 @@ struct { TOFU_DB_AUTO=0, TOFU_DB_SPLIT, TOFU_DB_FLAT } tofu_db_format; - /* TOFU_BINDING_BAD, TOFU_BINDING_ASK, TOFU_BINDING_AUTO, or - TOFU_BINDING_GOOD. */ - int tofu_default_policy; + enum tofu_policy tofu_default_policy; int force_ownertrust; enum { diff --git a/g10/test-stubs.c b/g10/test-stubs.c index dba603498..4edea69c7 100644 --- a/g10/test-stubs.c +++ b/g10/test-stubs.c @@ -429,11 +429,6 @@ export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options, return gpg_error (GPG_ERR_NOT_IMPLEMENTED); } -enum tofu_policy - { - tofu_policy - }; - gpg_error_t tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id, enum tofu_policy *policy) |