[Gpg4win-commits] r1089 - in trunk: . patches/gnupg2

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-02-04 17:10:28 +0100 (Wed, 04 Feb 2009)
New Revision: 1089

Added:
   trunk/patches/gnupg2/02-default-3des.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
Log:
Change default S/MIME cipher to 3DES.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-29 15:35:26 UTC (rev 1088)
+++ trunk/ChangeLog	2009-02-04 16:10:28 UTC (rev 1089)
@@ -1,3 +1,7 @@
+2009-02-04  Werner Koch  <wk at g10code.com>
+
+	* patches/gnupg2/02-default-3des.patch: New.
+
 2009-01-29  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Be relaxed

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-01-29 15:35:26 UTC (rev 1088)
+++ trunk/Makefile.am	2009-02-04 16:10:28 UTC (rev 1089)
@@ -40,6 +40,7 @@
 	patches/libetpan-0.54/02-index.patch \
 	patches/winpt/01-gpg-path.patch \
 	patches/gnupg2/01-version.patch.in \
+	patches/gnupg2/02-default-3des.patch \
 	patches/gnupg2-2.0.9/01-close-all-handle.patch \
 	patches/gnupg2-2.0.9/02-de.po-fix.patch \
 	patches/gnupg2-2.0.9/03-i18n+etc.patch \

Added: trunk/patches/gnupg2/02-default-3des.patch
===================================================================
--- trunk/patches/gnupg2/02-default-3des.patch	2009-01-29 15:35:26 UTC (rev 1088)
+++ trunk/patches/gnupg2/02-default-3des.patch	2009-02-04 16:10:28 UTC (rev 1089)
@@ -0,0 +1,29 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+The native Outlook 2003 S/MIME can't cope with AES.  Thus we change
+the default back to 3DES.
+
+
+--- sm/gpgsm.c  (revision 4923)
++++ sm/gpgsm.c  (working copy)
+@@ -893,7 +893,7 @@
+ 
+   /* 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.def_cipher_algoid = "3DES";
+ 
+   opt.homedir = default_homedir ();
+ 
+@@ -1607,7 +1607,7 @@
+ #ifndef HAVE_W32_SYSTEM
+         printf ("prefer-system-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
+ #endif
+-        printf ("cipher-algo:%lu:\"AES:\n", GC_OPT_FLAG_DEFAULT);
++        printf ("cipher-algo:%lu:\"3DES:\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);
+


Property changes on: trunk/patches/gnupg2/02-default-3des.patch
___________________________________________________________________
Name: svn:executable
   + *