aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/mail-to-translators9
-rw-r--r--sm/ChangeLog7
-rw-r--r--sm/gpgsm.c15
3 files changed, 23 insertions, 8 deletions
diff --git a/scripts/mail-to-translators b/scripts/mail-to-translators
index 3df59ad7b..2894eea71 100755
--- a/scripts/mail-to-translators
+++ b/scripts/mail-to-translators
@@ -48,15 +48,20 @@ security problems. Furthermore the TP Robot is not able to handle
more than one version of a project (we maintain 1.4 and 2.0) and thus
I'd ask you *not to use the TP Robot* for GnuPG.
+The release candidate for 2.0.10 is available at:
+
+ ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-2.0.10rc1.tar.bz2
+ ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-2.0.10rc1.tar.bz2.sig
+
Output of msgfmt is:
$(msgfmt --check --statistics $file 2>&1 | head)
If you are not able to continue the translation work, I suggest to
-pass this message on to another translator and drop a a short note to
+pass this message on to another translator and drop a short note to
-Thanks,
+Happy hacking,
Werner
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 5f76a5983..b47b3a45b 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-10 Werner Koch <[email protected]>
+
+ * gpgsm.c (our_cipher_test_algo): Use the GCRY constants as we now
+ require 1.4.
+ (our_md_test_algo): Ditto. Add SHA224.
+ (main) <aGpgConfList>: Update default cipher algo.
+
2008-12-09 Werner Koch <[email protected]>
* gpgsm.c (main): Call i18n_init before init_common_subsystems.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 4aa0dc9eb..dd9788b79 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -448,10 +448,10 @@ our_cipher_test_algo (int algo)
case GCRY_CIPHER_SERPENT128:
case GCRY_CIPHER_SERPENT192:
case GCRY_CIPHER_SERPENT256:
- case 309 /*GCRY_CIPHER_SEED*/:
- case 310 /*GCRY_CIPHER_CAMELLIA128*/:
- case 311 /*GCRY_CIPHER_CAMELLIA192*/:
- case 312 /*GCRY_CIPHER_CAMELLIA256*/:
+ case GCRY_CIPHER_SEED:
+ case GCRY_CIPHER_CAMELLIA128:
+ case GCRY_CIPHER_CAMELLIA192:
+ case GCRY_CIPHER_CAMELLIA256:
return gcry_cipher_test_algo (algo);
default:
return 1;
@@ -467,10 +467,11 @@ our_md_test_algo (int algo)
case GCRY_MD_MD5:
case GCRY_MD_SHA1:
case GCRY_MD_RMD160:
+ case GCRY_MD_SHA224:
case GCRY_MD_SHA256:
case GCRY_MD_SHA384:
case GCRY_MD_SHA512:
- case 305 /*GCRY_MD_WHIRLPOOL*/:
+ case GCRY_MD_WHIRLPOOL:
return gcry_md_test_algo (algo);
default:
return 1;
@@ -890,6 +891,8 @@ main ( int argc, char **argv)
create_dotlock (NULL); /* register locking cleanup */
+ /* Note: If you change this default cipher algorithm , please
+ remember to update the Gpgconflist entry as well. */
opt.def_cipher_algoid = "AES"; /*des-EDE3-CBC*/
opt.homedir = default_homedir ();
@@ -1604,7 +1607,7 @@ main ( int argc, char **argv)
#ifndef HAVE_W32_SYSTEM
printf ("prefer-system-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
#endif
- printf ("cipher-algo:%lu:\"3DES:\n", GC_OPT_FLAG_DEFAULT);
+ printf ("cipher-algo:%lu:\"AES:\n", GC_OPT_FLAG_DEFAULT);
printf ("p12-charset:%lu:\n", GC_OPT_FLAG_DEFAULT);
printf ("default-key:%lu:\n", GC_OPT_FLAG_DEFAULT);
printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_DEFAULT);