diff options
| author | Werner Koch <[email protected]> | 2010-04-20 17:57:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-04-20 17:57:50 +0000 |
| commit | 21b0a955be63dc69625194ece8557e79b6ad60c2 (patch) | |
| tree | 97de4727b46f1f2b5dac30142e5a408c898d48fc /g10/main.h | |
| parent | Add missing file. (diff) | |
| download | gnupg-21b0a955be63dc69625194ece8557e79b6ad60c2.tar.gz gnupg-21b0a955be63dc69625194ece8557e79b6ad60c2.zip | |
Generating an OpenPGP key cia gpg-agent basically works.
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/main.h b/g10/main.h index 540d9b1d9..c687ee2c6 100644 --- a/g10/main.h +++ b/g10/main.h @@ -237,10 +237,10 @@ int keygen_upd_std_prefs( PKT_signature *sig, void *opaque ); int keygen_add_keyserver_url(PKT_signature *sig, void *opaque); int keygen_add_notations(PKT_signature *sig,void *opaque); int keygen_add_revkey(PKT_signature *sig, void *opaque); -int make_backsig(PKT_signature *sig,PKT_public_key *pk, - PKT_public_key *sub_pk,PKT_secret_key *sub_sk, - u32 timestamp); -int generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock ); +gpg_error_t make_backsig (PKT_signature *sig, PKT_public_key *pk, + PKT_public_key *sub_pk, PKT_public_key *sub_psk, + u32 timestamp); +gpg_error_t generate_subkeypair (kbnode_t pub_keyblock); #ifdef ENABLE_CARD_SUPPORT int generate_card_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock, int keyno, const char *serialno); @@ -258,7 +258,7 @@ void try_make_homedir( const char *fname ); /*-- seskey.c --*/ void make_session_key( DEK *dek ); gcry_mpi_t encode_session_key( DEK *dek, unsigned nbits ); -gcry_mpi_t encode_md_value( PKT_public_key *pk, PKT_secret_key *sk, +gcry_mpi_t encode_md_value (PKT_public_key *pk, gcry_md_hd_t md, int hash_algo ); /*-- import.c --*/ |