summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-06-13 14:54:40 +0200
committerWerner Koch <wk@gnupg.org>2011-06-13 14:54:40 +0200
commit328ac58962ac9842e1e0c21c9ad12182f0d9bed6 (patch)
tree995d02b55ece37766d4c854584f67fcd4311aa48
parentRevert latest po add-line-number patch. (diff)
downloadgnupg2-328ac58962ac9842e1e0c21c9ad12182f0d9bed6.tar.xz
gnupg2-328ac58962ac9842e1e0c21c9ad12182f0d9bed6.zip
Fix for latest fix in Libgcrypt.
Diffstat (limited to '')
-rw-r--r--g10/ChangeLog7
-rw-r--r--g10/pkglue.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 91d49b4ad..67b981387 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-13 Werner Koch <wk@g10code.com>
+
+ * pkglue.c (mpi_from_sexp): Use GCRYMPI_FMT_USG to avoid problems
+ with leading zeroed. The latest Libgcrypt does this now
+ correctly. Given that the default of gcry_sexp_nth_mpi would use
+ a signed MPI, which is not implemented, the assertion would fail.
+
2011-06-01 Marcus Brinkmann <mb@g10code.com>
* parse-packet.c (parse_pubkeyenc): Change type of N to size_t.
diff --git a/g10/pkglue.c b/g10/pkglue.c
index 05f7167c2..3a078bd3f 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -40,7 +40,7 @@ mpi_from_sexp (gcry_sexp_t sexp, const char * item)
list = gcry_sexp_find_token (sexp, item, 0);
assert (list);
- data = gcry_sexp_nth_mpi (list, 1, 0);
+ data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
assert (data);
gcry_sexp_release (list);
return data;