diff options
| author | Werner Koch <[email protected]> | 2014-10-13 13:13:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-10-13 13:13:44 +0000 |
| commit | bf91c4c8d50ba6fc9ab06f79b02c01389e337c5e (patch) | |
| tree | 8b049d4ed261e45fc7d68c210a9c7ad58650c3d5 /g10/keydb.h | |
| parent | gpg: Remove all support for v3 keys and always create v4-signatures. (diff) | |
| parent | gpg: Remove extra RSA import status line. (diff) | |
| download | gnupg-wk/test-master.tar.gz gnupg-wk/test-master.zip | |
Merge branch 'master' into wk/test-masterwk/test-master
Diffstat (limited to '')
| -rw-r--r-- | g10/keydb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index 78d151a51..c61e0ae18 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -135,6 +135,7 @@ gpg_error_t keydb_add_resource (const char *url, unsigned int flags); KEYDB_HANDLE keydb_new (void); void keydb_release (KEYDB_HANDLE hd); +void keydb_disable_caching (KEYDB_HANDLE hd); const char *keydb_get_resource_name (KEYDB_HANDLE hd); gpg_error_t keydb_get_keyblock (KEYDB_HANDLE hd, KBNODE *ret_kb); gpg_error_t keydb_update_keyblock (KEYDB_HANDLE hd, kbnode_t kb); @@ -221,6 +222,7 @@ int get_pubkey_bynames( GETKEY_CTX *rx, PKT_public_key *pk, int get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock ); void get_pubkey_end( GETKEY_CTX ctx ); gpg_error_t get_seckey (PKT_public_key *pk, u32 *keyid); +gpg_error_t get_pubkey_byfpr (PKT_public_key *pk, const byte *fpr); int get_pubkey_byfprint( PKT_public_key *pk, const byte *fprint, size_t fprint_len ); int get_pubkey_byfprint_fast (PKT_public_key *pk, @@ -251,11 +253,12 @@ gpg_error_t enum_secret_keys (void **context, PKT_public_key *pk); void setup_main_keyids (kbnode_t keyblock); void merge_keys_and_selfsig( KBNODE keyblock ); -char*get_user_id_string( u32 *keyid ); char*get_user_id_string_native( u32 *keyid ); char*get_long_user_id_string( u32 *keyid ); char*get_user_id( u32 *keyid, size_t *rn ); char*get_user_id_native( u32 *keyid ); +char *get_user_id_byfpr (const byte *fpr, size_t *rn); +char *get_user_id_byfpr_native (const byte *fpr); KEYDB_HANDLE get_ctx_handle(GETKEY_CTX ctx); void release_akl(void); int parse_auto_key_locate(char *options); |