--- pgp/src/keymgmt.h 2018/04/24 16:39:18 1.1.1.3 +++ pgp/src/keymgmt.h 2018/04/24 16:40:07 1.1.1.4 @@ -47,12 +47,15 @@ int getpublickey(int flags, char *keyfil #define GPK_SHOW 2 #define GPK_NORVK 4 #define GPK_DISABLED 8 +/* Flag used in getsecretkey() only - should it be GSK_? */ +/* Prevents use of existing password list. */ +#define GPK_ASKPASS 16 /* Extract private key corresponding to keyID or userid from keyfile */ -int getsecretkey(int flags, char *keyfile, byte *keyID, - byte *timestamp, char *passp, boolean *hkey, byte *userid, - unitptr n, unitptr e, unitptr d, unitptr p, unitptr q, - unitptr u); +int getsecretkey(int flags, char *keyfile, byte *keyID, byte *timestamp, + byte *hpass, boolean *hkey, byte *userid, + unitptr n, unitptr e, unitptr d, unitptr p, unitptr q, + unitptr u); /* Return true if ctb is one for a key in a keyring */ int is_key_ctb (byte ctb);