Deleted HAVE_LIBGMP conditionals.

diff --git a/ChangeLog b/ChangeLog
index eb3ffc726c85b9f3d7276749283d296a5af5aeb8..2847f6ca60360ac5bacbcd9789e51b915da8d42f 100644 (file)
--- 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 76bfdcc50226083ef98df50d149ffcc71e421e86..8c195c00c55e51689fc827c617b684d5d7af723c 100644 (file)
--- 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 */