diff options
| author | Werner Koch <[email protected]> | 2010-02-02 14:06:19 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-02-02 14:06:19 +0000 |
| commit | 8459bcf95aef611feaa4ddb2ea9a50ee928ee9a0 (patch) | |
| tree | a9ce6bafa8e38e858cb358debc967bb5436f0e15 /g10/main.h | |
| parent | Fixed a regression introduced with 2.0.14. (diff) | |
| download | gnupg-8459bcf95aef611feaa4ddb2ea9a50ee928ee9a0.tar.gz gnupg-8459bcf95aef611feaa4ddb2ea9a50ee928ee9a0.zip | |
Various changes to eventually support openpgp keys in pgp-agent.
Comment fixes.
Minor chnages in preparation of a W32CE port.
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/g10/main.h b/g10/main.h index 90f005851..1d31f476d 100644 --- a/g10/main.h +++ b/g10/main.h @@ -103,7 +103,7 @@ void idea_cipher_warn( int show ); struct expando_args { PKT_public_key *pk; - PKT_secret_key *sk; + PKT_public_key *pksk; byte imagetype; int validity_info; const char *validity_string; @@ -195,7 +195,7 @@ int encrypt_filter (void *opaque, int control, /*-- sign.c --*/ -int complete_sig( PKT_signature *sig, PKT_secret_key *sk, gcry_md_hd_t md ); +int complete_sig (PKT_signature *sig, PKT_public_key *pksk, gcry_md_hd_t md); int sign_file( strlist_t filenames, int detached, strlist_t locusr, int do_encrypt, strlist_t remusr, const char *outfile ); int clearsign_file( const char *fname, strlist_t locusr, const char *outfile ); @@ -306,10 +306,9 @@ void print_revokers(PKT_public_key *pk); void show_policy_url(PKT_signature *sig,int indent,int mode); void show_keyserver_url(PKT_signature *sig,int indent,int mode); void show_notation(PKT_signature *sig,int indent,int mode,int which); -void dump_attribs(const PKT_user_id *uid, - PKT_public_key *pk,PKT_secret_key *sk); +void dump_attribs (const PKT_user_id *uid, PKT_public_key *pk); void set_attrib_fd(int fd); -void print_seckey_info (PKT_secret_key *sk); +void print_seckey_info (PKT_public_key *pk); void print_pubkey_info (FILE *fp, PKT_public_key *pk); void print_card_key_info (FILE *fp, KBNODE keyblock); |