[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.19-15-gfc30a41

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  fc30a414d8d6586207444356ec270bd3fe0f6e68 (commit)
       via  751b287179c3a485261051a8bc838ee9405fa890 (commit)
      from  8b5cb544a8a1d9274a072990b13bb1d3cb2f6ab2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc30a414d8d6586207444356ec270bd3fe0f6e68
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 18 11:45:00 2014 +0200

    gpg: Change default cipher for --symmetric from CAST5 to AES-128.
    
    * g10/main.h (DEFAULT_CIPHER_ALGO): Change to AES or CAST5 or 3DES
    depending on configure options.
    * g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
    
    --
    
    (cherry picked from commit 57df1121c18b004dd763b35eabf7b51fc9e8ec38)
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 27ae18c..0b8beed 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -11,7 +11,7 @@
 
 @c Begin algorithm defaults
 
- at set DEFSYMENCALGO CAST5
+ at set DEFSYMENCALGO AES128
 
 @c End algorithm defaults
 
diff --git a/g10/gpg.c b/g10/gpg.c
index 3f0d305..590be23 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1883,11 +1883,7 @@ main (int argc, char **argv )
     opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */
     opt.s2k_mode = 3; /* iterated+salted */
     opt.s2k_count = 96; /* 65536 iterations */
-#ifdef USE_CAST5
-    opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
-#else
-    opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
-#endif
+    opt.s2k_cipher_algo = DEFAULT_CIPHER_ALGO;
     opt.completes_needed = 1;
     opt.marginals_needed = 3;
     opt.max_cert_depth = 5;
diff --git a/g10/main.h b/g10/main.h
index dbc8d8f..21ec1f0 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -26,11 +26,18 @@
 #include "keydb.h"
 
 /* It could be argued that the default cipher should be 3DES rather
-   than CAST5, and the default compression should be 0
+   than AES128, and the default compression should be 0
    (i.e. uncompressed) rather than 1 (zip).  However, the real world
    issues of speed and size come into play here. */
 
-#define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_CAST5
+#if USE_AES
+# define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_AES
+#elif USE_CAST5
+# define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_CAST5
+#else
+# define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_3DES
+#endif
+
 #define DEFAULT_DIGEST_ALGO     DIGEST_ALGO_SHA1
 #define DEFAULT_COMPRESS_ALGO   COMPRESS_ALGO_ZIP
 #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1

commit 751b287179c3a485261051a8bc838ee9405fa890
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Aug 18 13:34:57 2015 +0200

    Pass DBUS_SESSION_BUS_ADDRESS for gnome3
    
    * g10/passphrase.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
    --
    
    pinentry-gnome3 talks to the gcr prompter via dbus.  Without this
    environment variable, it can't find the correct session to talk to.

diff --git a/g10/passphrase.c b/g10/passphrase.c
index 9003ea4..7cc9f6e 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -195,6 +195,7 @@ agent_send_all_options (assuan_context_t ctx)
   char *dft_display = NULL;
   const char *dft_ttyname = NULL;
   char *dft_ttytype = NULL;
+  char *dbus_session_address = NULL;
   char *old_lc = NULL;
   char *dft_lc = NULL;
   int rc = 0;
@@ -207,6 +208,14 @@ agent_send_all_options (assuan_context_t ctx)
         return -1;
     }
 
+  dbus_session_address = getenv ("DBUS_SESSION_BUS_ADDRESS");
+  if (dbus_session_address)
+    {
+      if (agent_send_option (ctx, "putenv=DBUS_SESSION_BUS_ADDRESS",
+                             dbus_session_address))
+        return -1;
+    }
+
   if (!opt.ttyname)
     {
       const char *tmp;

-----------------------------------------------------------------------

Summary of changes:
 doc/gpg.texi     |  2 +-
 g10/gpg.c        |  6 +-----
 g10/main.h       | 11 +++++++++--
 g10/passphrase.c |  9 +++++++++
 4 files changed, 20 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org