diff options
author | Werner Koch <[email protected]> | 2000-10-04 11:16:19 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2000-10-04 11:16:19 +0000 |
commit | 9c20f65cbe9d3d806b02f0f90a2051a20f3857db (patch) | |
tree | 6c784f870b191b2a1b3f16f86cff3a5af59ff2f6 /g10/keydb.h | |
parent | See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch (diff) | |
download | gnupg-9c20f65cbe9d3d806b02f0f90a2051a20f3857db.tar.gz gnupg-9c20f65cbe9d3d806b02f0f90a2051a20f3857db.zip |
See ChangeLog: Wed Oct 4 13:16:18 CEST 2000 Werner Koch
Diffstat (limited to '')
-rw-r--r-- | g10/keydb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index 830a7db3c..43c36e719 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -166,6 +166,7 @@ int get_seckey_next( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_keyblock ); void get_seckey_end( GETKEY_CTX ctx ); int enum_secret_keys( void **context, PKT_secret_key *sk, int with_subkeys ); void merge_keys_and_selfsig( KBNODE keyblock ); +void merge_public_with_secret ( KBNODE pubblock, KBNODE secblock ); char*get_user_id_string( u32 *keyid ); char*get_user_id_string_native( u32 *keyid ); char*get_long_user_id_string( u32 *keyid ); |