[Pkg-gnupg-commit] [gnupg2] 01/01: use larger secmem for gpg-agent (Closes: #846953)

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit b72d24dc78caed7d72857676e88186c128bdc38a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Dec 6 17:17:35 2016 -0500

    use larger secmem for gpg-agent (Closes: #846953)
---
 .../0026-agent-Respect-enable-large-secmem.patch   | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0026-agent-Respect-enable-large-secmem.patch b/debian/patches/0026-agent-Respect-enable-large-secmem.patch
new file mode 100644
index 0000000..121bc0b
--- /dev/null
+++ b/debian/patches/0026-agent-Respect-enable-large-secmem.patch
@@ -0,0 +1,31 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Tue, 6 Dec 2016 11:01:22 -0500
+Subject: agent: Respect --enable-large-secmem
+
+* agent/gpg-agent.c (main): Initialize secmem to the configured buffer
+size.
+
+--
+
+This patch is a step toward addressing
+GnuPG-bug-id: 2857
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+(cherry picked from commit 8636ad5023a1bdc527add40a5508f8c5b7c35221)
+---
+ agent/gpg-agent.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
+index efef8c1..196d6ac 100644
+--- a/agent/gpg-agent.c
++++ b/agent/gpg-agent.c
+@@ -1066,7 +1066,7 @@ main (int argc, char **argv )
+     }
+ 
+   /* Initialize the secure memory. */
+-  gcry_control (GCRYCTL_INIT_SECMEM, 32768, 0);
++  gcry_control (GCRYCTL_INIT_SECMEM, SECMEM_BUFFER_SIZE, 0);
+   maybe_setuid = 0;
+ 
+   /*
diff --git a/debian/patches/series b/debian/patches/series
index b2dbf53..c00a636 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
 0023-agent-dirmngr-Tiny-restructuring.patch
 0024-gpg-Let-only-Dirmngr-decide-whether-CERT-is-supporte.patch
 0025-gpg-Fix-error-code-arg-in-ERRSIG-status-line.patch
+0026-agent-Respect-enable-large-secmem.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git