From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 25 Jun 2014 16:28:51 +0000 (+0200)
Subject: Deleted HAVE_LIBGMP conditionals.
X-Git-Tag: nettle_3.1rc1~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec593a7852830ecbc49e270f92b440b119421934;p=thirdparty%2Fnettle.git

Deleted HAVE_LIBGMP conditionals.
---

diff --git a/ChangeLog b/ChangeLog
index eb3ffc72..2847f6ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-25  Niels Möller  <nisse@lysator.liu.se>
+
+	* der-iterator.c: Deleted HAVE_LIBGMP conditionals.
+
 2014-06-07  Niels Möller  <nisse@lysator.liu.se>
 
 	* Released nettle-3.0
diff --git a/der-iterator.c b/der-iterator.c
index 76bfdcc5..8c195c00 100644
--- a/der-iterator.c
+++ b/der-iterator.c
@@ -38,9 +38,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#if HAVE_LIBGMP
 #include "bignum.h"
-#endif
 
 #include "asn1.h"
 
@@ -254,7 +252,9 @@ asn1_der_get_uint32(struct asn1_der_iterator *i,
   return 1;
 }
 
-#if HAVE_LIBGMP
+/* NOTE: This is the only function in this file which needs bignums.
+   One could split this file in two, one in libnettle and one in
+   libhogweed. */
 int
 asn1_der_get_bignum(struct asn1_der_iterator *i,
 		    mpz_t x, unsigned max_bits)
@@ -277,4 +277,3 @@ asn1_der_get_bignum(struct asn1_der_iterator *i,
 
   return 1;
 }
-#endif /* HAVE_LIBGMP */