diff options
| -rw-r--r-- | g10/ChangeLog | 10 | ||||
| -rw-r--r-- | g10/keygen.c | 4 | ||||
| -rw-r--r-- | g10/mainproc.c | 2 | ||||
| -rw-r--r-- | g10/options.skel | 19 |
4 files changed, 25 insertions, 10 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 717e06cd1..4c25e991a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,13 @@ +2003-03-04 David Shaw <[email protected]> + + * options.skel: Add explantion and commented-out + "no-mangle-dos-filenames". + + * mainproc.c (proc_encrypted): Make string translatable. + + * keygen.c (keygen_set_std_prefs): Include AES192, and AES256 in + default prefs. + 2003-03-03 David Shaw <[email protected]> * keyring.c (keyring_rebuild_cache): Lock the keyring while diff --git a/g10/keygen.c b/g10/keygen.c index 372f61d63..ea60fa81d 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -228,9 +228,9 @@ keygen_set_std_prefs (const char *string,int personal) if (opt.def_preference_list) string=opt.def_preference_list; else if ( !check_cipher_algo(CIPHER_ALGO_IDEA) ) - string = "S7 S3 S2 S1 H2 H3 Z2 Z1"; + string = "S9 S8 S7 S3 S2 S1 H2 H3 Z2 Z1"; else - string = "S7 S3 S2 H2 H3 Z2 Z1"; + string = "S9 S8 S7 S3 S2 H2 H3 Z2 Z1"; /* If we have it, IDEA goes *after* 3DES so it won't be used unless we're encrypting along with a V3 key. Ideally, we diff --git a/g10/mainproc.c b/g10/mainproc.c index 7c635b78b..3edf310ac 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -505,7 +505,7 @@ proc_encrypted( CTX c, PACKET *pkt ) if( pkt->pkt.encrypted->mdc_method && !result ) write_status( STATUS_GOODMDC ); else if(!opt.no_mdc_warn) - log_info ("WARNING: message was not integrity protected\n"); + log_info (_("WARNING: message was not integrity protected\n")); } else if( result == G10ERR_BAD_SIGN ) { log_error(_("WARNING: encrypted message has been manipulated!\n")); diff --git a/g10/options.skel b/g10/options.skel index f2811d850..e50f66ffe 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -56,7 +56,7 @@ # If you do not use the Latin-1 (ISO-8859-1) charset, you should tell # GnuPG which is the native character set. Please check the man page # for supported character sets. This character set is only used for -# Meta data and not for the actual message which does not undergo any +# metadata and not for the actual message which does not undergo any # translation. Note that future version of GnuPG will change to UTF-8 # as default character set. @@ -74,6 +74,11 @@ #group mynames = paige 0x12345678 joe patti +# Some old Windows platforms require 8.3 filenames. If your system +# can handle long filenames, uncomment this. + +#no-mangle-dos-filenames + # Lock the file only once for the lifetime of a process. If you do # not define this, the lock will be obtained and released every time # it is needed - normally this is not needed. @@ -168,7 +173,8 @@ # generating and then cleaning up a secure temp file. # # The default program is "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin" -# On Mac OS X and Windows, the default is to use your regular image viewer. +# On Mac OS X and Windows, the default is to use your regular JPEG image +# viewer. # # Some other viewers: # photo-viewer "qiv %i" @@ -181,13 +187,12 @@ # Use your MIME handler to view photos: # photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG" - # Passphrase agent # -# We support the old experimental passphrase agent protocol as well -# as the new Assuan based one (currently available in the "newpg" package -# at ftp.gnupg.org/gcrypt/alpha/aegypten/). To make use of the agent, you have -# to run an agent as daemon and use the option +# We support the old experimental passphrase agent protocol as well as +# the new Assuan based one (currently available in the "newpg" package +# at ftp.gnupg.org/gcrypt/alpha/aegypten/). To make use of the agent, +# you have to run an agent as daemon and use the option # # use-agent # |