security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

* options.h, g10.c (main): Add list-option list-preferred-keyserver. 

* keyedit.c (change_passphrase): When responding 'no' to the blank
passphrase question, re-prompt for a new passphrase.  This is bug #202.
This commit is contained in:
David Shaw 2003-08-26 04:07:52 +00:00
parent 68aa60e79c
commit 2d682ddc00
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,5 +1,12 @@
2003-08-25 David Shaw <dshaw@jabberwocky.com> 2003-08-25 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main): Add list-option
list-preferred-keyserver.
* keyedit.c (change_passphrase): When responding 'no' to the blank
passphrase question, re-prompt for a new passphrase. This is bug
#202.
* mainproc.c (check_sig_and_print): Use two different preferred * mainproc.c (check_sig_and_print): Use two different preferred
keyserver displays - one if the key is not present (to tell the keyserver displays - one if the key is not present (to tell the
user where to get the key), the other if it is present (to tell user where to get the key), the other if it is present (to tell

3
g10/g10.c
View File

@ -1761,9 +1761,10 @@ main( int argc, char **argv )
{"show-photos",LIST_SHOW_PHOTOS}, {"show-photos",LIST_SHOW_PHOTOS},
{"show-policy-url",LIST_SHOW_POLICY}, {"show-policy-url",LIST_SHOW_POLICY},
{"show-notation",LIST_SHOW_NOTATION}, {"show-notation",LIST_SHOW_NOTATION},
{"show-keyring",LIST_SHOW_KEYRING}, {"show-preferred-keyserver",LIST_SHOW_KEYSERVER},
{"show-validity",LIST_SHOW_VALIDITY}, {"show-validity",LIST_SHOW_VALIDITY},
{"show-long-keyid",LIST_SHOW_LONG_KEYID}, {"show-long-keyid",LIST_SHOW_LONG_KEYID},
{"show-keyring",LIST_SHOW_KEYRING},
{"show-sig-expire",LIST_SHOW_SIG_EXPIRE}, {"show-sig-expire",LIST_SHOW_SIG_EXPIRE},
{NULL,0} {NULL,0}
}; };

4
g10/keyedit.c
View File

@ -1003,8 +1003,10 @@ change_passphrase( KBNODE keyblock )
" this is probably a *bad* idea!\n\n")); " this is probably a *bad* idea!\n\n"));
if( cpr_get_answer_is_yes("change_passwd.empty.okay", if( cpr_get_answer_is_yes("change_passwd.empty.okay",
_("Do you really want to do this? "))) _("Do you really want to do this? ")))
{
changed++; changed++;
break; break;
}
} }
else { /* okay */ else { /* okay */
rc = 0; rc = 0;

15
g10/options.h
View File

@ -228,13 +228,14 @@ struct {
#define EXPORT_INCLUDE_ATTRIBUTES 4 #define EXPORT_INCLUDE_ATTRIBUTES 4
#define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8 #define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8
#define LIST_SHOW_PHOTOS 1 #define LIST_SHOW_PHOTOS 1
#define LIST_SHOW_POLICY 2 #define LIST_SHOW_POLICY 2
#define LIST_SHOW_NOTATION 4 #define LIST_SHOW_NOTATION 4
#define LIST_SHOW_KEYRING 8 #define LIST_SHOW_KEYSERVER 8
#define LIST_SHOW_VALIDITY 16 #define LIST_SHOW_VALIDITY 16
#define LIST_SHOW_LONG_KEYID 32 #define LIST_SHOW_LONG_KEYID 32
#define LIST_SHOW_SIG_EXPIRE 64 #define LIST_SHOW_KEYRING 64
#define LIST_SHOW_SIG_EXPIRE 128
#define VERIFY_SHOW_PHOTOS 1 #define VERIFY_SHOW_PHOTOS 1
#define VERIFY_SHOW_POLICY 2 #define VERIFY_SHOW_POLICY 2