Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/gnupg/files: gnupg-2.0.17-libgrcrypt150-bugfix.patch
Date: Sun, 03 Jul 2011 23:24:04
Message-Id: 20110703232351.B65F020051@flycatcher.gentoo.org
1 robbat2 11/07/03 23:23:51
2
3 Added: gnupg-2.0.17-libgrcrypt150-bugfix.patch
4 Log:
5 Bug #373959: critical patch to enable signing w/ libgcrypt-1.5.0.
6
7 (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-crypt/gnupg/files/gnupg-2.0.17-libgrcrypt150-bugfix.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/files/gnupg-2.0.17-libgrcrypt150-bugfix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/files/gnupg-2.0.17-libgrcrypt150-bugfix.patch?rev=1.1&content-type=text/plain
14
15 Index: gnupg-2.0.17-libgrcrypt150-bugfix.patch
16 ===================================================================
17 From 13290b0e0fcf3a493e4848b29329d56b69bc4dd9 Mon Sep 17 00:00:00 2001
18 From: Werner Koch <wk@×××××.org>
19 Date: Mon, 13 Jun 2011 14:35:30 +0200
20 Subject: [PATCH] Fix a for a bug fix in the latest Libgcrypt.
21
22 * pkglue.c (mpi_from_sexp, pk_decrypt): Use GCRYMPI_FMT_USG for
23 gcry_sexp_nth_mpi. This fixes a problem with a recent bug fix in
24 Libgcrypt.
25
26 diff --git a/g10/pkglue.c b/g10/pkglue.c
27 index cbfe21e..5c47511 100644
28 --- a/g10/pkglue.c
29 +++ b/g10/pkglue.c
30 @@ -34,10 +34,10 @@ mpi_from_sexp (gcry_sexp_t sexp, const char * item)
31 {
32 gcry_sexp_t list;
33 gcry_mpi_t data;
34 -
35 +
36 list = gcry_sexp_find_token (sexp, item, 0);
37 assert (list);
38 - data = gcry_sexp_nth_mpi (list, 1, 0);
39 + data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
40 assert (data);
41 gcry_sexp_release (list);
42 return data;
43 @@ -293,7 +293,7 @@ pk_decrypt (int algo, gcry_mpi_t * result, gcry_mpi_t * data,
44 if (rc)
45 return rc;
46
47 - *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
48 + *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
49 gcry_sexp_release (s_plain);
50 if (!*result)
51 return -1; /* oops */
52 --
53 1.7.1