diff options
| author | Werner Koch <[email protected]> | 2024-03-12 15:00:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-03-12 15:00:55 +0000 |
| commit | 4485930f9fd9ff02ca5c8472cf6aed3fdb1280cf (patch) | |
| tree | 683140a4a33b0f3accf5b1f2455274d251581970 /g10/keydb.h | |
| parent | gpg: Fix a possible segv due to an uninitialized gcrypt context. (diff) | |
| parent | Post release updates (diff) | |
| download | gnupg-4485930f9fd9ff02ca5c8472cf6aed3fdb1280cf.tar.gz gnupg-4485930f9fd9ff02ca5c8472cf6aed3fdb1280cf.zip | |
Merge branch 'STABLE-BRANCH-2-4'
--
Resolved conflicts:
NEWS
common/exechelp-w32.c
configure.ac
Diffstat (limited to 'g10/keydb.h')
| -rw-r--r-- | g10/keydb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index b18f6e93a..62a99295d 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -487,6 +487,7 @@ const char *key_origin_string (int origin); /*-- keyid.c --*/ int pubkey_letter( int algo ); char *pubkey_string (PKT_public_key *pk, char *buffer, size_t bufsize); +int compare_pubkey_string (const char *astr, const char *bstr); #define PUBKEY_STRING_SIZE 32 u32 v3_keyid (gcry_mpi_t a, u32 *ki); void hash_public_key( gcry_md_hd_t md, PKT_public_key *pk ); @@ -572,6 +573,7 @@ const char *colon_expirestr_from_sig (PKT_signature *sig); byte *fingerprint_from_pk( PKT_public_key *pk, byte *buf, size_t *ret_len ); byte *v5_fingerprint_from_pk (PKT_public_key *pk, byte *array, size_t *ret_len); void fpr20_from_pk (PKT_public_key *pk, byte array[20]); +void fpr20_from_fpr (const byte *fpr, unsigned int fprlen, byte array[20]); char *hexfingerprint (PKT_public_key *pk, char *buffer, size_t buflen); char *v5hexfingerprint (PKT_public_key *pk, char *buffer, size_t buflen); char *format_hexfingerprint (const char *fingerprint, |