diff options
| -rw-r--r-- | src/engine.c | 12 | ||||
| -rw-r--r-- | src/gpgme.def | 4 | ||||
| -rw-r--r-- | src/key.c | 98 | ||||
| -rw-r--r-- | src/libgpgme.vers | 3 |
4 files changed, 1 insertions, 116 deletions
diff --git a/src/engine.c b/src/engine.c index 287e182f..516bc3d1 100644 --- a/src/engine.c +++ b/src/engine.c @@ -934,18 +934,6 @@ _gpgme_engine_op_sign (engine_t engine, gpgme_data_t in, gpgme_data_t out, gpgme_error_t -_gpgme_engine_op_trustlist (engine_t engine, const char *pattern) -{ - (void)pattern; - - if (!engine) - return gpg_error (GPG_ERR_INV_VALUE); - - return gpg_error (GPG_ERR_NOT_IMPLEMENTED); -} - - -gpgme_error_t _gpgme_engine_op_verify (engine_t engine, gpgme_verify_flags_t flags, gpgme_data_t sig, gpgme_data_t signed_text, gpgme_data_t plaintext, gpgme_ctx_t ctx) diff --git a/src/gpgme.def b/src/gpgme.def index a952daf1..5a7f430a 100644 --- a/src/gpgme.def +++ b/src/gpgme.def @@ -113,9 +113,7 @@ EXPORTS gpgme_op_sign @88 gpgme_op_sign_result @89 gpgme_op_sign_start @90 - gpgme_op_trustlist_end @91 - gpgme_op_trustlist_next @92 - gpgme_op_trustlist_start @93 + gpgme_op_verify @94 gpgme_op_verify_result @95 gpgme_op_verify_start @96 @@ -485,101 +485,3 @@ gpgme_key_release (gpgme_key_t key) { gpgme_key_unref (key); } - - -static const char * -otrust_to_string (int otrust) -{ - switch (otrust) - { - case GPGME_VALIDITY_NEVER: - return "n"; - - case GPGME_VALIDITY_MARGINAL: - return "m"; - - case GPGME_VALIDITY_FULL: - return "f"; - - case GPGME_VALIDITY_ULTIMATE: - return "u"; - - default: - return "?"; - } -} - - -static const char * -validity_to_string (int validity) -{ - switch (validity) - { - case GPGME_VALIDITY_UNDEFINED: - return "q"; - - case GPGME_VALIDITY_NEVER: - return "n"; - - case GPGME_VALIDITY_MARGINAL: - return "m"; - - case GPGME_VALIDITY_FULL: - return "f"; - - case GPGME_VALIDITY_ULTIMATE: - return "u"; - - case GPGME_VALIDITY_UNKNOWN: - default: - return "?"; - } -} - - -static const char * -capabilities_to_string (gpgme_subkey_t subkey) -{ - static const char *const strings[8] = - { - "", - "c", - "s", - "sc", - "e", - "ec", - "es", - "esc" - }; - return strings[(!!subkey->can_encrypt << 2) - | (!!subkey->can_sign << 1) - | (!!subkey->can_certify)]; -} - - -static gpgme_key_sig_t -get_keysig (gpgme_key_t key, int uid_idx, int idx) -{ - gpgme_user_id_t uid; - gpgme_key_sig_t sig; - - if (!key || uid_idx < 0 || idx < 0) - return NULL; - - uid = key->uids; - while (uid && uid_idx > 0) - { - uid = uid->next; - uid_idx--; - } - if (!uid) - return NULL; - - sig = uid->signatures; - while (sig && idx > 0) - { - sig = sig->next; - idx--; - } - return sig; -} diff --git a/src/libgpgme.vers b/src/libgpgme.vers index e6091ec4..3b7849bb 100644 --- a/src/libgpgme.vers +++ b/src/libgpgme.vers @@ -244,9 +244,6 @@ GPGME_1.0 { gpgme_op_sign; gpgme_op_sign_result; gpgme_op_sign_start; - gpgme_op_trustlist_end; - gpgme_op_trustlist_next; - gpgme_op_trustlist_start; gpgme_op_verify; gpgme_op_verify_result; gpgme_op_verify_start; |