From ad9aeb8b08c2a29a61a0a2226070d5b002507f83 Mon Sep 17 00:00:00 2001 From: cyrus Date: Wed, 18 Jun 2014 10:04:43 +0000 Subject: [PATCH] nettle: import from packages, update to 3.0 Signed-off-by: Steven Barth git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41248 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libs/nettle/Config.in | 9 + package/libs/nettle/Makefile | 85 ++ ...2-Added-option-to-use-mini-gmp-in-hogweed.patch | 403 +++++++ ...al-macros-in-nettle.m4-to-allow-regenerat.patch | 1233 ++++++++++++++++++++ ...0004-Added-auto-generated-nettle-config.h.patch | 84 ++ ...low-der-iterator-to-be-used-with-mini-gmp.patch | 29 + 6 files changed, 1843 insertions(+) create mode 100644 package/libs/nettle/Config.in create mode 100644 package/libs/nettle/Makefile create mode 100644 package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch create mode 100644 package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch create mode 100644 package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch create mode 100644 package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch diff --git a/package/libs/nettle/Config.in b/package/libs/nettle/Config.in new file mode 100644 index 0000000000..0d4806ab3a --- /dev/null +++ b/package/libs/nettle/Config.in @@ -0,0 +1,9 @@ +# nettle avanced configuration + +menu "Configuration" + depends on PACKAGE_libnettle + +config LIBNETTLE_MINI + bool "use mini-gmp instead of gmp; the library will be much smaller at a 10x performance penalty. Note that this option may have side effects to programs that link to both nettle and gmp." + +endmenu diff --git a/package/libs/nettle/Makefile b/package/libs/nettle/Makefile new file mode 100644 index 0000000000..a5e0eaa79e --- /dev/null +++ b/package/libs/nettle/Makefile @@ -0,0 +1,85 @@ +# +# Copyright (C) 2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nettle +PKG_VERSION:=3.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/nettle +PKG_MD5SUM:=f64b1bf1e774b7ae6e507318e340250e +PKG_MAINTAINER:=Nikos Mavrogiannopoulos + +PKG_LICENSE:=LGPLv2 +PKG_LICENSE_FILES:=COPYING + +PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=0 + +include $(INCLUDE_DIR)/package.mk + +define Package/libnettle + SECTION:=libs + CATEGORY:=Libraries + TITLE:=GNU crypto library + URL:=http://www.lysator.liu.se/~nisse/nettle/ + DEPENDS+= +!LIBNETTLE_MINI:libgmp +endef + +define Package/libnettle/config + source "$(SOURCE)/Config.in" +endef + +TARGET_CFLAGS += $(FPIC) + +CONFIGURE_ARGS += \ + --enable-shared \ + --disable-openssl \ + --disable-documentation \ + --enable-static + +ifeq ($(CONFIG_LIBNETTLE_MINI),y) +CONFIGURE_ARGS += --enable-mini-gmp +endif + +ifeq ($(CONFIG_CPU_SUBTYPE),neon) +CONFIGURE_ARGS += \ + --enable-arm-neon +endif + +define Build/Compile + $(call Build/Compile/Default, \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + CC="$(TARGET_CC)" \ + libnettle.so libhogweed.so + +$(MAKE) -i $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + install) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/nettle + $(CP) $(PKG_INSTALL_DIR)/usr/include/nettle/*.h $(1)/usr/include/nettle/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnettle.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhogweed.{a,so*} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/nettle.pc \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/hogweed.pc \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/libnettle/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnettle.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhogweed.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libnettle)) diff --git a/package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch b/package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch new file mode 100644 index 0000000000..56627a10c4 --- /dev/null +++ b/package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch @@ -0,0 +1,403 @@ +From 8d5360e3e5eea3c9dbfd44f9b981f18a41605e45 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Sun, 9 Mar 2014 11:30:25 +0100 +Subject: [PATCH 2/5] Added option to use mini-gmp in hogweed. + +--- + Makefile.in | 8 +++-- + bignum.h | 6 +++- + configure.ac | 76 +++++++++++++++++++++++++++++++++++------------- + dsa.h | 2 +- + ecc-internal.h | 2 +- + ecc.h | 2 +- + eccdata.c | 12 +++++++- + examples/Makefile.in | 2 +- + examples/ecc-benchmark.c | 2 ++ + gmp-glue.c | 1 + + gmp-glue.h | 2 +- + hogweed.pc.in | 2 +- + mini-gmp.c | 2 +- + mini-gmp.h | 9 ++++++ + pkcs1.h | 2 +- + rsa.h | 2 +- + testsuite/Makefile.in | 4 +-- + testsuite/testutils.h | 5 ++-- + 18 files changed, 102 insertions(+), 39 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -15,6 +15,10 @@ MKDIR_P = @MKDIR_P@ + OPT_ASM_NETTLE_SOURCES = @OPT_ASM_NETTLE_SOURCES@ + OPT_ASM_HOGWEED_SOURCES = @OPT_ASM_HOGWEED_SOURCES@ + ++OPT_HOGWEED_SOURCES = @OPT_HOGWEED_SOURCES@ ++ ++OPT_HOGWEED_HEADERS = @OPT_HOGWEED_HEADERS@ ++ + SUBDIRS = tools testsuite examples + + include config.make +@@ -132,7 +136,7 @@ nettle_SOURCES = aes-decrypt-internal.c + write-be32.c write-le32.c write-le64.c \ + yarrow256.c yarrow_key_event.c + +-hogweed_SOURCES = sexp.c sexp-format.c \ ++hogweed_SOURCES = $(OPT_HOGWEED_SOURCES) sexp.c sexp-format.c \ + sexp-transport.c sexp-transport-format.c \ + bignum.c bignum-random.c bignum-random-prime.c \ + sexp2bignum.c \ +@@ -183,7 +187,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1. + pgp.h pkcs1.h realloc.h ripemd160.h rsa.h \ + salsa20.h sexp.h \ + serpent.h sha.h sha1.h sha2.h sha3.h twofish.h \ +- umac.h yarrow.h poly1305.h ++ umac.h yarrow.h poly1305.h $(OPT_HOGWEED_HEADERS) + + INSTALL_HEADERS = $(HEADERS) nettle-stdint.h + +--- a/bignum.h ++++ b/bignum.h +@@ -36,7 +36,11 @@ + + #include "nettle-meta.h" + +-#include ++#ifdef USE_MINI_GMP ++# include "mini-gmp.h" ++#else ++# include ++#endif + #include "nettle-types.h" + + #ifdef __cplusplus +--- a/configure.ac ++++ b/configure.ac +@@ -72,6 +72,16 @@ AC_ARG_ENABLE(arm-neon, + AC_HELP_STRING([--enable-arm-neon], [Enable ARM Neon assembly. (default=auto)]),, + [enable_arm_neon=auto]) + ++AC_ARG_ENABLE(mini-gmp, ++ AC_HELP_STRING([--enable-mini-gmp], [Disable gmp support and enable mini-gmp. (default=disabled)]),, ++ [enable_mini_gmp=no]) ++ ++if test "x$enable_mini_gmp" = xyes ; then ++GMP_LIBS="" ++else ++GMP_LIBS="-lgmp" ++fi ++ + LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ + `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \ + /usr/local/lib /sw/local/lib /sw/lib \ +@@ -441,7 +451,7 @@ case "$host_os" in + LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR).dylib' + LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR).dylib' + LIBHOGWEED_LINK='$(CC) $(CFLAGS) -dynamiclib -L. $(LDFLAGS) -install_name ${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR) -current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)' +- LIBHOGWEED_LIBS='-lnettle -lgmp' ++ LIBHOGWEED_LIBS='-lnettle $(GMP_LIBS)' + ;; + solaris*) + # Sun's ld uses -h to set the soname, and this option is passed +@@ -457,7 +467,7 @@ case "$host_os" in + LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' + LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' + LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -G -h $(LIBHOGWEED_SONAME)' +- LIBHOGWEED_LIBS='libnettle.so -lgmp' ++ LIBHOGWEED_LIBS='libnettle.so $(GMP_LIBS)' + ;; + *) + LIBNETTLE_FORLINK=libnettle.so +@@ -474,7 +484,7 @@ case "$host_os" in + # (does not work in general, e.g., with static linking all of + # -lhogweed -lgmp -lnettle are still required). Also makes dlopen + # of libhogweed.so work, without having to use RTLD_GLOBAL. +- LIBHOGWEED_LIBS='libnettle.so -lgmp' ++ LIBHOGWEED_LIBS='libnettle.so $(GMP_LIBS)' + ;; + esac + +@@ -692,7 +702,18 @@ if test "x$nettle_cv_fcntl_locking" = "x + fi + + # Checks for libraries ++TESTSUITE_LIBS="" ++ ++OPT_HOGWEED_SOURCES="" ++OPT_HOGWEED_HEADERS="" + if test "x$enable_public_key" = "xyes" ; then ++if test "x$enable_mini_gmp" = xyes ; then ++ OPT_HOGWEED_SOURCES="$OPT_HOGWEED_SOURCES mini-gmp.c" ++ OPT_HOGWEED_HEADERS="$OPT_HOGWEED_HEADERS mini-gmp.h" ++ AC_DEFINE([USE_MINI_GMP], 1, [Use mini-gmp instead of gmp]) ++ IF_NOT_MINI_GMP='#' ++ GMP_NUMB_BITS="0" ++else + AC_CHECK_LIB(gmp, __gmpz_getlimbn,, + [AC_MSG_WARN( + [GNU MP not found, or not 3.1 or up, see http://gmplib.org/. +@@ -701,9 +722,7 @@ if test "x$enable_public_key" = "xyes" ; + + # Add -R flags needed to run programs linked with gmp + LSH_RPATH_FIX +-fi + +-if test "x$enable_public_key" = "xyes" ; then + # Check for gmp limb size + nettle_cv_gmp_numb_bits=0 + if test "$enable_public_key" = yes; then +@@ -714,12 +733,23 @@ if test "x$enable_public_key" = "xyes" ; + + AC_MSG_RESULT([$nettle_cv_gmp_numb_bits bits]) + fi ++ + + GMP_NUMB_BITS="$nettle_cv_gmp_numb_bits" + AC_SUBST([GMP_NUMB_BITS]) + + AH_TEMPLATE([HAVE_MPZ_POWM_SEC], [Define if mpz_powm_sec is available (appeared in GMP-5)]) + AC_CHECK_FUNC(__gmpz_powm_sec, [AC_DEFINE(HAVE_MPZ_POWM_SEC)]) ++ IF_NOT_MINI_GMP='' ++ TESTSUITE_LIBS="-lgmp" ++fi ++ AC_SUBST([GMP_LIBS]) ++dnl The testsuite requires gmp ++AC_SUBST([TESTSUITE_LIBS]) ++AC_SUBST([GMP_NUMB_BITS]) ++AC_SUBST([OPT_HOGWEED_SOURCES]) ++AC_SUBST([OPT_HOGWEED_HEADERS]) ++ + fi + + AH_TEMPLATE([WITH_HOGWEED], [Defined if public key features are enabled]) +@@ -765,6 +795,7 @@ else + IF_DOCUMENTATION='#' + fi + ++AC_SUBST(IF_NOT_MINI_GMP) + AC_SUBST(IF_HOGWEED) + AC_SUBST(IF_STATIC) + AC_SUBST(IF_SHARED) +--- a/dsa.h ++++ b/dsa.h +@@ -34,7 +34,7 @@ + #ifndef NETTLE_DSA_H_INCLUDED + #define NETTLE_DSA_H_INCLUDED + +-#include ++#include "bignum.h" + + #include "nettle-types.h" + +--- a/ecc-internal.h ++++ b/ecc-internal.h +@@ -34,7 +34,7 @@ + #ifndef NETTLE_ECC_INTERNAL_H_INCLUDED + #define NETTLE_ECC_INTERNAL_H_INCLUDED + +-#include ++#include "bignum.h" + + #include "nettle-types.h" + #include "ecc-curve.h" +--- a/ecc.h ++++ b/ecc.h +@@ -34,7 +34,7 @@ + #ifndef NETTLE_ECC_H_INCLUDED + #define NETTLE_ECC_H_INCLUDED + +-#include ++#include "bignum.h" + + #include "nettle-types.h" + +--- a/eccdata.c ++++ b/eccdata.c +@@ -33,11 +33,14 @@ + + /* Development of Nettle's ECC support was funded by the .SE Internet Fund. */ + ++#include "config.h" ++ + #include + #include + #include + #include + ++#include "mini-gmp.h" + #include "mini-gmp.c" + + /* Affine coordinates, for simplicity. Infinity point represented as x +@@ -904,6 +907,7 @@ int + main (int argc, char **argv) + { + struct ecc_curve ecc; ++ unsigned bits; + + if (argc < 4) + { +@@ -911,6 +915,7 @@ main (int argc, char **argv) + return EXIT_FAILURE; + } + ++ bits = atoi(argv[4]); + ecc_curve_init (&ecc, atoi(argv[1])); + + ecc_pippenger_precompute (&ecc, atoi(argv[2]), atoi(argv[3])); +@@ -921,7 +926,12 @@ main (int argc, char **argv) + ecc_curve_check (&ecc); + + if (argc > 4) +- output_curve (&ecc, atoi(argv[4])); ++ { ++ /* when using mini-gmp we cannot estimate it on configure */ ++ if (bits == 0) ++ bits = GMP_NUMB_BITS; ++ output_curve (&ecc, bits); ++ } + + return EXIT_SUCCESS; + } +--- a/examples/Makefile.in ++++ b/examples/Makefile.in +@@ -11,7 +11,7 @@ PRE_CPPFLAGS = -I.. -I$(top_srcdir) + PRE_LDFLAGS = -L.. + + OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@ +-BENCH_LIBS = @BENCH_LIBS@ -lm ++BENCH_LIBS = @BENCH_LIBS@ $(TESTSUITE_LIBS) -lm + + HOGWEED_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \ + rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT) \ +--- a/examples/ecc-benchmark.c ++++ b/examples/ecc-benchmark.c +@@ -46,6 +46,8 @@ + + #include "timing.h" + ++#undef USE_MINI_GMP ++#include + #include "../ecc.h" + #include "../ecc-internal.h" + #include "../gmp-glue.h" +--- a/gmp-glue.c ++++ b/gmp-glue.c +@@ -271,3 +271,4 @@ gmp_free(void *p, size_t n) + + free_func (p, (size_t) n); + } ++ +--- a/gmp-glue.h ++++ b/gmp-glue.h +@@ -33,7 +33,7 @@ + #ifndef NETTLE_GMP_GLUE_H_INCLUDED + #define NETTLE_GMP_GLUE_H_INCLUDED + +-#include ++#include "bignum.h" + + #include "nettle-stdint.h" + +--- a/hogweed.pc.in ++++ b/hogweed.pc.in +@@ -13,6 +13,6 @@ URL: http://www.lysator.liu.se/~nisse/ne + Version: @PACKAGE_VERSION@ + Requires.private: nettle + Libs: -L${libdir} -lhogweed +-Libs.private: -lgmp ++Libs.private: @GMP_LIBS@ + Cflags: -I${includedir} + +--- a/mini-gmp.c ++++ b/mini-gmp.c +@@ -1388,7 +1388,7 @@ mpz_clear (mpz_t r) + gmp_free (r->_mp_d); + } + +-static void * ++void * + mpz_realloc (mpz_t r, mp_size_t size) + { + size = GMP_MAX (size, 1); +--- a/mini-gmp.h ++++ b/mini-gmp.h +@@ -70,6 +70,11 @@ typedef struct + mp_limb_t *_mp_d; /* Pointer to the limbs. */ + } __mpz_struct; + ++typedef __mpz_struct MP_INT; ++ ++#define GMP_NUMB_BITS (SIZEOF_LONG*8) ++#define GMP_NUMB_MASK (~0) ++ + typedef __mpz_struct mpz_t[1]; + + typedef __mpz_struct *mpz_ptr; +@@ -119,6 +124,10 @@ void mpz_init (mpz_t); + void mpz_init2 (mpz_t, mp_bitcnt_t); + void mpz_clear (mpz_t); + ++void * ++mpz_realloc (mpz_t r, mp_size_t size); ++#define _mpz_realloc mpz_realloc ++ + #define mpz_odd_p(z) (((z)->_mp_size != 0) & (int) (z)->_mp_d[0]) + #define mpz_even_p(z) (! mpz_odd_p (z)) + +--- a/pkcs1.h ++++ b/pkcs1.h +@@ -34,7 +34,7 @@ + #ifndef NETTLE_PKCS1_H_INCLUDED + #define NETTLE_PKCS1_H_INCLUDED + +-#include ++#include "bignum.h" + #include "nettle-types.h" + + #ifdef __cplusplus +--- a/rsa.h ++++ b/rsa.h +@@ -34,7 +34,7 @@ + #ifndef NETTLE_RSA_H_INCLUDED + #define NETTLE_RSA_H_INCLUDED + +-#include ++#include "bignum.h" + #include "nettle-types.h" + + #include "md5.h" +--- a/testsuite/Makefile.in ++++ b/testsuite/Makefile.in +@@ -50,7 +50,7 @@ TS_HOGWEED = $(TS_HOGWEED_SOURCES:.c=$(E + TS_C = $(TS_NETTLE) @IF_HOGWEED@ $(TS_HOGWEED) + TS_CXX = @IF_CXX@ $(CXX_SOURCES:.cxx=$(EXEEXT)) + TARGETS = $(TS_C) $(TS_CXX) +-TS_SH = sexp-conv-test pkcs1-conv-test nettle-pbkdf2-test symbols-test ++TS_SH = sexp-conv-test pkcs1-conv-test nettle-pbkdf2-test symbols-test @IF_NOT_MINI_GMP@ + TS_ALL = $(TARGETS) $(TS_SH) + EXTRA_SOURCES = sha1-huge-test.c + EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT)) +@@ -78,7 +78,7 @@ all: $(EXTRA_TARGETS) + + LIB_HOGWEED = @IF_HOGWEED@ -lhogweed + TEST_OBJS = testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ +- $(LIB_HOGWEED) -lnettle $(LIBS) ++ $(LIB_HOGWEED) -lnettle $(LIBS) $(TESTSUITE_LIBS) + + ../nettle-internal.$(OBJEXT): + ( cd .. && $(MAKE) nettle-internal.$(OBJEXT) ) +--- a/testsuite/testutils.h ++++ b/testsuite/testutils.h +@@ -12,11 +12,10 @@ + #include + #include + +-#if HAVE_LIBGMP +-# include "bignum.h" +-#endif + + #if WITH_HOGWEED ++# include ++# undef USE_MINI_GMP + # include "rsa.h" + # include "dsa-compat.h" + # include "ecc-curve.h" diff --git a/package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch b/package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch new file mode 100644 index 0000000000..d6e29c85aa --- /dev/null +++ b/package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch @@ -0,0 +1,1233 @@ +From a6d49f192166d20755a6651d4612d3abcd780822 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Sun, 9 Mar 2014 11:58:05 +0100 +Subject: [PATCH 3/5] Include local macros in nettle.m4 to allow regeneration. + +--- + configure.ac | 1 + + nettle.m4 | 1209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1210 insertions(+) + create mode 100644 nettle.m4 + +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,7 @@ AC_PREREQ(2.61) + AC_CONFIG_SRCDIR([arcfour.c]) + # Needed to stop autoconf from looking for files in parent directories. + AC_CONFIG_AUX_DIR([.]) ++AC_CONFIG_MACRO_DIR([.]) + + AC_CONFIG_HEADER([config.h]) + +--- /dev/null ++++ b/nettle.m4 +@@ -0,0 +1,1209 @@ ++dnl Try to detect the type of the third arg to getsockname() et al ++AC_DEFUN([LSH_TYPE_SOCKLEN_T], ++[AH_TEMPLATE([socklen_t], [Length type used by getsockopt]) ++AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_type_socklen_t, ++[AC_EGREP_HEADER(socklen_t, sys/socket.h, ++ [ac_cv_type_socklen_t=yes], [ac_cv_type_socklen_t=no])]) ++if test $ac_cv_type_socklen_t = no; then ++ AC_MSG_CHECKING(for AIX) ++ AC_EGREP_CPP(yes, [ ++#ifdef _AIX ++ yes ++#endif ++],[ ++AC_MSG_RESULT(yes) ++AC_DEFINE(socklen_t, size_t) ++],[ ++AC_MSG_RESULT(no) ++AC_DEFINE(socklen_t, int) ++]) ++fi ++]) ++ ++dnl Choose cc flags for compiling position independent code ++dnl FIXME: Doesn't do the right thing when crosscompiling. ++AC_DEFUN([LSH_CCPIC], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_MSG_CHECKING(CCPIC) ++AC_CACHE_VAL(lsh_cv_sys_ccpic,[ ++ if test -z "$CCPIC" ; then ++ if test "$GCC" = yes ; then ++ case "$host_os" in ++ bsdi4.*) CCPIC="-fPIC" ;; ++ bsdi*) CCPIC="" ;; ++ darwin*) CCPIC="-fPIC" ;; ++ # Could also use -fpic, depending on the number of symbol references ++ solaris*) CCPIC="-fPIC" ;; ++ cygwin*) CCPIC="" ;; ++ mingw32*) CCPIC="" ;; ++ *) CCPIC="-fpic" ;; ++ esac ++ else ++ case "$host_os" in ++ darwin*) CCPIC="-fPIC" ;; ++ irix*) CCPIC="-share" ;; ++ hpux*) CCPIC="+z"; ;; ++ *freebsd*) CCPIC="-fpic" ;; ++ sco*|sysv4.*) CCPIC="-KPIC -dy -Bdynamic" ;; ++ solaris*) CCPIC="-KPIC -Bdynamic" ;; ++ winnt*) CCPIC="-shared" ;; ++ *) CCPIC="" ;; ++ esac ++ fi ++ fi ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $CCPIC" ++ AC_TRY_COMPILE([], [exit(0);], ++ lsh_cv_sys_ccpic="$CCPIC", lsh_cv_sys_ccpic='') ++ CFLAGS="$OLD_CFLAGS" ++]) ++CCPIC="$lsh_cv_sys_ccpic" ++AC_MSG_RESULT($CCPIC) ++AC_SUBST([CCPIC])]) ++ ++dnl LSH_PATH_ADD(path-id, directory) ++AC_DEFUN([LSH_PATH_ADD], ++[AC_MSG_CHECKING($2) ++ac_exists=no ++if test -d "$2/." ; then ++ ac_real_dir=`cd $2 && pwd` ++ if test -n "$ac_real_dir" ; then ++ ac_exists=yes ++ for old in $1_REAL_DIRS ; do ++ ac_found=no ++ if test x$ac_real_dir = x$old ; then ++ ac_found=yes; ++ break; ++ fi ++ done ++ if test $ac_found = yes ; then ++ AC_MSG_RESULT(already added) ++ else ++ AC_MSG_RESULT(added) ++ # LDFLAGS="$LDFLAGS -L $2" ++ $1_REAL_DIRS="$ac_real_dir [$]$1_REAL_DIRS" ++ $1_DIRS="$2 [$]$1_DIRS" ++ fi ++ fi ++fi ++if test $ac_exists = no ; then ++ AC_MSG_RESULT(not found) ++fi ++]) ++ ++dnl LSH_RPATH_ADD(dir) ++AC_DEFUN([LSH_RPATH_ADD], [LSH_PATH_ADD(RPATH_CANDIDATE, $1)]) ++ ++dnl LSH_RPATH_INIT(candidates) ++AC_DEFUN([LSH_RPATH_INIT], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_MSG_CHECKING([for -R flag]) ++RPATHFLAG='' ++case "$host_os" in ++ osf1*) RPATHFLAG="-rpath " ;; ++ irix6.*|irix5.*) RPATHFLAG="-rpath " ;; ++ solaris*) ++ if test "$TCC" = "yes"; then ++ # tcc doesn't know about -R ++ RPATHFLAG="-Wl,-R," ++ else ++ RPATHFLAG=-R ++ fi ++ ;; ++ linux*) RPATHFLAG="-Wl,-rpath," ;; ++ *) RPATHFLAG="" ;; ++esac ++ ++if test x$RPATHFLAG = x ; then ++ AC_MSG_RESULT(none) ++else ++ AC_MSG_RESULT([using $RPATHFLAG]) ++fi ++ ++RPATH_CANDIDATE_REAL_DIRS='' ++RPATH_CANDIDATE_DIRS='' ++ ++AC_MSG_RESULT([Searching for libraries]) ++ ++for d in $1 ; do ++ LSH_RPATH_ADD($d) ++done ++]) ++ ++dnl Try to execute a main program, and if it fails, try adding some ++dnl -R flag. ++dnl LSH_RPATH_FIX ++AC_DEFUN([LSH_RPATH_FIX], ++[if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then ++ ac_success=no ++ AC_TRY_RUN([int main(int argc, char **argv) { return 0; }], ++ ac_success=yes, ac_success=no, :) ++ ++ if test $ac_success = no ; then ++ AC_MSG_CHECKING([Running simple test program failed. Trying -R flags]) ++dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS ++ ac_remaining_dirs='' ++ ac_rpath_save_LDFLAGS="$LDFLAGS" ++ for d in $RPATH_CANDIDATE_DIRS ; do ++ if test $ac_success = yes ; then ++ ac_remaining_dirs="$ac_remaining_dirs $d" ++ else ++ LDFLAGS="$RPATHFLAG$d $LDFLAGS" ++dnl echo LDFLAGS = $LDFLAGS ++ AC_TRY_RUN([int main(int argc, char **argv) { return 0; }], ++ [ac_success=yes ++ ac_rpath_save_LDFLAGS="$LDFLAGS" ++ AC_MSG_RESULT([adding $RPATHFLAG$d]) ++ ], ++ [ac_remaining_dirs="$ac_remaining_dirs $d"], :) ++ LDFLAGS="$ac_rpath_save_LDFLAGS" ++ fi ++ done ++ RPATH_CANDIDATE_DIRS=$ac_remaining_dirs ++ fi ++ if test $ac_success = no ; then ++ AC_MSG_RESULT(failed) ++ fi ++fi ++]) ++ ++dnl Like AC_CHECK_LIB, but uses $KRB_LIBS rather than $LIBS. ++dnl LSH_CHECK_KRB_LIB(LIBRARY, FUNCTION, [, ACTION-IF-FOUND [, ++dnl ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) ++ ++AC_DEFUN([LSH_CHECK_KRB_LIB], ++[AC_CHECK_LIB([$1], [$2], ++ ifelse([$3], , ++ [[ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++ AC_DEFINE_UNQUOTED($ac_tr_lib) ++ KRB_LIBS="-l$1 $KRB_LIBS" ++ ]], [$3]), ++ ifelse([$4], , , [$4 ++])dnl ++, [$5 $KRB_LIBS]) ++]) ++ ++dnl LSH_LIB_ARGP(ACTION-IF-OK, ACTION-IF-BAD) ++AC_DEFUN([LSH_LIB_ARGP], ++[ ac_argp_save_LIBS="$LIBS" ++ ac_argp_save_LDFLAGS="$LDFLAGS" ++ ac_argp_ok=no ++ # First check if we can link with argp. ++ AC_SEARCH_LIBS(argp_parse, argp, ++ [ LSH_RPATH_FIX ++ AC_CACHE_CHECK([for working argp], ++ lsh_cv_lib_argp_works, ++ [ AC_TRY_RUN( ++[#include ++#include ++ ++static const struct argp_option ++options[] = ++{ ++ { NULL, 0, NULL, 0, NULL, 0 } ++}; ++ ++struct child_state ++{ ++ int n; ++}; ++ ++static error_t ++child_parser(int key, char *arg, struct argp_state *state) ++{ ++ struct child_state *input = (struct child_state *) state->input; ++ ++ switch(key) ++ { ++ default: ++ return ARGP_ERR_UNKNOWN; ++ case ARGP_KEY_END: ++ if (!input->n) ++ input->n = 1; ++ break; ++ } ++ return 0; ++} ++ ++const struct argp child_argp = ++{ ++ options, ++ child_parser, ++ NULL, NULL, NULL, NULL, NULL ++}; ++ ++struct main_state ++{ ++ struct child_state child; ++ int m; ++}; ++ ++static error_t ++main_parser(int key, char *arg, struct argp_state *state) ++{ ++ struct main_state *input = (struct main_state *) state->input; ++ ++ switch(key) ++ { ++ default: ++ return ARGP_ERR_UNKNOWN; ++ case ARGP_KEY_INIT: ++ state->child_inputs[0] = &input->child; ++ break; ++ case ARGP_KEY_END: ++ if (!input->m) ++ input->m = input->child.n; ++ ++ break; ++ } ++ return 0; ++} ++ ++static const struct argp_child ++main_children[] = ++{ ++ { &child_argp, 0, "", 0 }, ++ { NULL, 0, NULL, 0} ++}; ++ ++static const struct argp ++main_argp = ++{ options, main_parser, ++ NULL, ++ NULL, ++ main_children, ++ NULL, NULL ++}; ++ ++int main(int argc, char **argv) ++{ ++ struct main_state input = { { 0 }, 0 }; ++ char *v[2] = { "foo", NULL }; ++ ++ argp_parse(&main_argp, 1, v, 0, NULL, &input); ++ ++ if ( (input.m == 1) && (input.child.n == 1) ) ++ return 0; ++ else ++ return 1; ++} ++], lsh_cv_lib_argp_works=yes, ++ lsh_cv_lib_argp_works=no, ++ lsh_cv_lib_argp_works=no)]) ++ ++ if test x$lsh_cv_lib_argp_works = xyes ; then ++ ac_argp_ok=yes ++ else ++ # Reset link flags ++ LIBS="$ac_argp_save_LIBS" ++ LDFLAGS="$ac_argp_save_LDFLAGS" ++ fi]) ++ ++ if test x$ac_argp_ok = xyes ; then ++ ifelse([$1],, true, [$1]) ++ else ++ ifelse([$2],, true, [$2]) ++ fi ++]) ++ ++dnl LSH_GCC_ATTRIBUTES ++dnl Check for gcc's __attribute__ construction ++ ++AC_DEFUN([LSH_GCC_ATTRIBUTES], ++[AC_CACHE_CHECK(for __attribute__, ++ lsh_cv_c_attribute, ++[ AC_TRY_COMPILE([ ++#include ++ ++static void foo(void) __attribute__ ((noreturn)); ++ ++static void __attribute__ ((noreturn)) ++foo(void) ++{ ++ exit(1); ++} ++],[], ++lsh_cv_c_attribute=yes, ++lsh_cv_c_attribute=no)]) ++ ++AH_TEMPLATE([HAVE_GCC_ATTRIBUTE], [Define if the compiler understands __attribute__]) ++if test "x$lsh_cv_c_attribute" = "xyes"; then ++ AC_DEFINE(HAVE_GCC_ATTRIBUTE) ++fi ++ ++AH_BOTTOM( ++[#if __GNUC__ && HAVE_GCC_ATTRIBUTE ++# define NORETURN __attribute__ ((__noreturn__)) ++# define PRINTF_STYLE(f, a) __attribute__ ((__format__ (__printf__, f, a))) ++# define UNUSED __attribute__ ((__unused__)) ++#else ++# define NORETURN ++# define PRINTF_STYLE(f, a) ++# define UNUSED ++#endif ++])]) ++ ++# Check for alloca, and include the standard blurb in config.h ++AC_DEFUN([LSH_FUNC_ALLOCA], ++[AC_FUNC_ALLOCA ++AC_CHECK_HEADERS([malloc.h]) ++AH_BOTTOM( ++[/* AIX requires this to be the first thing in the file. */ ++#ifndef __GNUC__ ++# if HAVE_ALLOCA_H ++# include ++# else ++# ifdef _AIX ++ #pragma alloca ++# else ++# ifndef alloca /* predefined by HP cc +Olibcalls */ ++char *alloca (); ++# endif ++# endif ++/* Needed for alloca on windows */ ++# if HAVE_MALLOC_H ++# include ++# endif ++# endif ++#else /* defined __GNUC__ */ ++# if HAVE_ALLOCA_H ++# include ++# else ++/* Needed for alloca on windows, also with gcc */ ++# if HAVE_MALLOC_H ++# include ++# endif ++# endif ++#endif ++])]) ++ ++AC_DEFUN([LSH_FUNC_STRERROR], ++[AC_CHECK_FUNCS(strerror) ++AH_BOTTOM( ++[#if HAVE_STRERROR ++#define STRERROR strerror ++#else ++#define STRERROR(x) (sys_errlist[x]) ++#endif ++])]) ++ ++AC_DEFUN([LSH_FUNC_STRSIGNAL], ++[AC_CHECK_FUNCS(strsignal) ++AC_CHECK_DECLS([sys_siglist, _sys_siglist]) ++AH_BOTTOM( ++[#if HAVE_STRSIGNAL ++# define STRSIGNAL strsignal ++#else /* !HAVE_STRSIGNAL */ ++# if HAVE_DECL_SYS_SIGLIST ++# define STRSIGNAL(x) (sys_siglist[x]) ++# else ++# if HAVE_DECL__SYS_SIGLIST ++# define STRSIGNAL(x) (_sys_siglist[x]) ++# else ++# define STRSIGNAL(x) "Unknown signal" ++# if __GNUC__ ++# warning Using dummy STRSIGNAL ++# endif ++# endif ++# endif ++#endif /* !HAVE_STRSIGNAL */ ++])]) ++ ++dnl LSH_MAKE_CONDITIONAL(symbol, test) ++AC_DEFUN([LSH_MAKE_CONDITIONAL], ++[if $2 ; then ++ IF_$1='' ++ UNLESS_$1='# ' ++else ++ IF_$1='# ' ++ UNLESS_$1='' ++fi ++AC_SUBST(IF_$1) ++AC_SUBST(UNLESS_$1)]) ++ ++dnl LSH_DEPENDENCY_TRACKING ++ ++dnl Defines compiler flags DEP_FLAGS to generate dependency ++dnl information, and DEP_PROCESS that is any shell commands needed for ++dnl massaging the dependency information further. Dependencies are ++dnl generated as a side effect of compilation. Dependency files ++dnl themselves are not treated as targets. ++ ++AC_DEFUN([LSH_DEPENDENCY_TRACKING], ++[AC_ARG_ENABLE(dependency_tracking, ++ AC_HELP_STRING([--disable-dependency-tracking], ++ [Disable dependency tracking. Dependency tracking doesn't work with BSD make]),, ++ [enable_dependency_tracking=yes]) ++ ++DEP_FLAGS='' ++DEP_PROCESS='true' ++if test x$enable_dependency_tracking = xyes ; then ++ if test x$GCC = xyes ; then ++ gcc_version=`gcc --version | head -1` ++ case "$gcc_version" in ++ 2.*|*[[!0-9.]]2.*) ++ enable_dependency_tracking=no ++ AC_MSG_WARN([Dependency tracking disabled, gcc-3.x is needed]) ++ ;; ++ *) ++ DEP_FLAGS='-MT $[]@ -MD -MP -MF $[]@.d' ++ DEP_PROCESS='true' ++ ;; ++ esac ++ else ++ enable_dependency_tracking=no ++ AC_MSG_WARN([Dependency tracking disabled]) ++ fi ++fi ++ ++if test x$enable_dependency_tracking = xyes ; then ++ DEP_INCLUDE='include ' ++else ++ DEP_INCLUDE='# ' ++fi ++ ++AC_SUBST([DEP_INCLUDE]) ++AC_SUBST([DEP_FLAGS]) ++AC_SUBST([DEP_PROCESS])]) ++ ++dnl GMP_TRY_ASSEMBLE(asm-code,[action-success][,action-fail]) ++dnl ---------------------------------------------------------- ++dnl Attempt to assemble the given code. ++dnl Do "action-success" if this succeeds, "action-fail" if not. ++dnl ++dnl conftest.o and conftest.out are available for inspection in ++dnl "action-success". If either action does a "break" out of a loop then ++dnl an explicit "rm -f conftest*" will be necessary. ++dnl ++dnl This is not unlike AC_TRY_COMPILE, but there's no default includes or ++dnl anything in "asm-code", everything wanted must be given explicitly. ++ ++AC_DEFUN([GMP_TRY_ASSEMBLE], ++[cat >conftest.s <&AC_FD_CC ++ ifelse([$2],,:,[$2]) ++else ++ cat conftest.out >&AC_FD_CC ++ echo "configure: failed program was:" >&AC_FD_CC ++ cat conftest.s >&AC_FD_CC ++ ifelse([$3],,:,[$3]) ++fi ++rm -f conftest* ++]) ++ ++dnl GMP_PROG_CC_FOR_BUILD ++dnl --------------------- ++dnl Establish CC_FOR_BUILD, a C compiler for the build system. ++dnl ++dnl If CC_FOR_BUILD is set then it's expected to work, likewise the old ++dnl style HOST_CC, otherwise some likely candidates are tried, the same as ++dnl configfsf.guess. ++ ++AC_DEFUN([GMP_PROG_CC_FOR_BUILD], ++[AC_REQUIRE([AC_PROG_CC]) ++if test -n "$CC_FOR_BUILD"; then ++ GMP_PROG_CC_FOR_BUILD_WORKS($CC_FOR_BUILD,, ++ [AC_MSG_ERROR([Specified CC_FOR_BUILD doesn't seem to work])]) ++elif test -n "$HOST_CC"; then ++ GMP_PROG_CC_FOR_BUILD_WORKS($HOST_CC, ++ [CC_FOR_BUILD=$HOST_CC], ++ [AC_MSG_ERROR([Specified HOST_CC doesn't seem to work])]) ++elif test $cross_compiling = no ; then ++ CC_FOR_BUILD="$CC" ++else ++ for i in cc gcc c89 c99; do ++ GMP_PROG_CC_FOR_BUILD_WORKS($i, ++ [CC_FOR_BUILD=$i ++ break]) ++ done ++ if test -z "$CC_FOR_BUILD"; then ++ AC_MSG_ERROR([Cannot find a build system compiler]) ++ fi ++fi ++ ++AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) ++AC_SUBST(CC_FOR_BUILD) ++]) ++ ++ ++dnl GMP_PROG_CC_FOR_BUILD_WORKS(cc/cflags[,[action-if-good][,action-if-bad]]) ++dnl ------------------------------------------------------------------------- ++dnl See if the given cc/cflags works on the build system. ++dnl ++dnl It seems easiest to just use the default compiler output, rather than ++dnl figuring out the .exe or whatever at this stage. ++ ++AC_DEFUN([GMP_PROG_CC_FOR_BUILD_WORKS], ++[AC_MSG_CHECKING([build system compiler $1]) ++# remove anything that might look like compiler output to our "||" expression ++rm -f conftest* a.out b.out a.exe a_out.exe ++cat >conftest.c <&AC_FD_CC 2>&1; then ++ cc_for_build_works=yes ++ fi ++fi ++rm -f conftest* a.out b.out a.exe a_out.exe ++AC_MSG_RESULT($cc_for_build_works) ++if test "$cc_for_build_works" = yes; then ++ ifelse([$2],,:,[$2]) ++else ++ ifelse([$3],,:,[$3]) ++fi ++]) ++ ++dnl GMP_PROG_EXEEXT_FOR_BUILD ++dnl ------------------------- ++dnl Determine EXEEXT_FOR_BUILD, the build system executable suffix. ++dnl ++dnl The idea is to find what "-o conftest$foo" will make it possible to run ++dnl the program with ./conftest. On Unix-like systems this is of course ++dnl nothing, for DOS it's ".exe", or for a strange RISC OS foreign file ++dnl system cross compile it can be ",ff8" apparently. Not sure if the ++dnl latter actually applies to a build-system executable, maybe it doesn't, ++dnl but it won't hurt to try. ++ ++AC_DEFUN([GMP_PROG_EXEEXT_FOR_BUILD], ++[AC_REQUIRE([GMP_PROG_CC_FOR_BUILD]) ++AC_CACHE_CHECK([for build system executable suffix], ++ gmp_cv_prog_exeext_for_build, ++[if test $cross_compiling = no ; then ++ gmp_cv_prog_exeext_for_build="$EXEEXT" ++else ++ cat >conftest.c <&AC_FD_CC; then ++ gmp_cv_prog_exeext_for_build=$i ++ break ++ fi ++ fi ++ done ++ rm -f conftest* ++ if test "${gmp_cv_prog_exeext_for_build+set}" != set; then ++ AC_MSG_ERROR([Cannot determine executable suffix]) ++ fi ++fi ++]) ++AC_SUBST(EXEEXT_FOR_BUILD,$gmp_cv_prog_exeext_for_build) ++]) ++ ++dnl NETTLE_CHECK_ARM_NEON ++dnl --------------------- ++dnl Check if ARM Neon instructions should be used. ++dnl Obeys enable_arm_neon, which should be set earlier. ++AC_DEFUN([NETTLE_CHECK_ARM_NEON], ++[if test "$enable_arm_neon" = auto ; then ++ if test "$cross_compiling" = yes ; then ++ dnl Check if compiler/assembler accepts it, ++ dnl without an explicit .fpu neon directive. ++ AC_CACHE_CHECK([if assembler accepts Neon instructions], ++ nettle_cv_asm_arm_neon, ++ [GMP_TRY_ASSEMBLE([ ++.text ++foo: ++ vmlal.u32 q1, d0, d1 ++], ++ [nettle_cv_asm_arm_neon=yes], ++ [nettle_cv_asm_arm_neon=no])]) ++ enable_arm_neon="$nettle_cv_asm_arm_neon" ++ else ++ AC_MSG_CHECKING([if /proc/cpuinfo claims neon support]) ++ if grep '^Features.*:.* neon' /proc/cpuinfo >/dev/null ; then ++ enable_arm_neon=yes ++ else ++ enable_arm_neon=no ++ fi ++ AC_MSG_RESULT($enable_arm_neon) ++ fi ++fi ++]) ++ ++dnl @synopsis AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])] ++dnl ++dnl the "ISO C9X: 7.18 Integer types " section requires the ++dnl existence of an include file that defines a set of ++dnl typedefs, especially uint8_t,int32_t,uintptr_t. ++dnl Many older installations will not provide this file, but some will ++dnl have the very same definitions in . In other enviroments ++dnl we can use the inet-types in which would define the ++dnl typedefs int8_t and u_int8_t respectivly. ++dnl ++dnl This macros will create a local "_stdint.h" or the headerfile given as ++dnl an argument. In many cases that file will just "#include " ++dnl or "#include ", while in other environments it will provide ++dnl the set of basic 'stdint's definitions/typedefs: ++dnl int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t ++dnl int_least32_t.. int_fast32_t.. intmax_t ++dnl which may or may not rely on the definitions of other files, ++dnl or using the AC_CHECK_SIZEOF macro to determine the actual ++dnl sizeof each type. ++dnl ++dnl if your header files require the stdint-types you will want to create an ++dnl installable file mylib-int.h that all your other installable header ++dnl may include. So if you have a library package named "mylib", just use ++dnl AX_CREATE_STDINT_H(mylib-int.h) ++dnl in configure.ac and go to install that very header file in Makefile.am ++dnl along with the other headers (mylib.h) - and the mylib-specific headers ++dnl can simply use "#include " to obtain the stdint-types. ++dnl ++dnl Remember, if the system already had a valid , the generated ++dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things... ++dnl ++dnl @, (status: used on new platforms) (see http://ac-archive.sf.net/gstdint/) ++dnl @author Guido Draheim ++ ++AC_DEFUN([AX_CREATE_STDINT_H], ++[# ------ AX CREATE STDINT H ------------------------------------- ++AC_MSG_CHECKING([for stdint types]) ++ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)` ++# try to shortcircuit - if the default include path of the compiler ++# can find a "stdint.h" header then we assume that all compilers can. ++AC_CACHE_VAL([ac_cv_header_stdint_t],[ ++old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" ++old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" ++old_CFLAGS="$CFLAGS" ; CFLAGS="" ++AC_TRY_COMPILE([#include ],[int_least32_t v = 0;], ++[ac_cv_stdint_result="(assuming C99 compatible system)" ++ ac_cv_header_stdint_t="stdint.h"; ], ++[ac_cv_header_stdint_t=""]) ++CXXFLAGS="$old_CXXFLAGS" ++CPPFLAGS="$old_CPPFLAGS" ++CFLAGS="$old_CFLAGS" ]) ++ ++v="... $ac_cv_header_stdint_h" ++if test "$ac_stdint_h" = "stdint.h" ; then ++ AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)]) ++elif test "$ac_stdint_h" = "inttypes.h" ; then ++ AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)]) ++elif test "_$ac_cv_header_stdint_t" = "_" ; then ++ AC_MSG_RESULT([(putting them into $ac_stdint_h)$v]) ++else ++ ac_cv_header_stdint="$ac_cv_header_stdint_t" ++ AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)]) ++fi ++ ++if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. ++ ++dnl .....intro message done, now do a few system checks..... ++dnl btw, all CHECK_TYPE macros do automatically "DEFINE" a type, therefore ++dnl we use the autoconf implementation detail _AC CHECK_TYPE_NEW instead ++ ++inttype_headers=`echo $2 | sed -e 's/,/ /g'` ++ ++ac_cv_stdint_result="(no helpful system typedefs seen)" ++AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[ ++ ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) ++ AC_MSG_RESULT([(..)]) ++ for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ; do ++ unset ac_cv_type_uintptr_t ++ unset ac_cv_type_uint64_t ++ _AC_CHECK_TYPE_NEW(uintptr_t,[ac_cv_header_stdint_x=$i],dnl ++ continue,[#include <$i>]) ++ AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) ++ ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" ++ break; ++ done ++ AC_MSG_CHECKING([for stdint uintptr_t]) ++ ]) ++ ++if test "_$ac_cv_header_stdint_x" = "_" ; then ++AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[ ++ ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) ++ AC_MSG_RESULT([(..)]) ++ for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ; do ++ unset ac_cv_type_uint32_t ++ unset ac_cv_type_uint64_t ++ AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],dnl ++ continue,[#include <$i>]) ++ AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) ++ ac_cv_stdint_result="(seen uint32_t$and64 in $i)" ++ break; ++ done ++ AC_MSG_CHECKING([for stdint uint32_t]) ++ ]) ++fi ++ ++if test "_$ac_cv_header_stdint_x" = "_" ; then ++if test "_$ac_cv_header_stdint_o" = "_" ; then ++AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[ ++ ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) ++ AC_MSG_RESULT([(..)]) ++ for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do ++ unset ac_cv_type_u_int32_t ++ unset ac_cv_type_u_int64_t ++ AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],dnl ++ continue,[#include <$i>]) ++ AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>]) ++ ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" ++ break; ++ done ++ AC_MSG_CHECKING([for stdint u_int32_t]) ++ ]) ++fi fi ++ ++dnl if there was no good C99 header file, do some typedef checks... ++if test "_$ac_cv_header_stdint_x" = "_" ; then ++ AC_MSG_CHECKING([for stdint datatype model]) ++ AC_MSG_RESULT([(..)]) ++ AC_CHECK_SIZEOF(char) ++ AC_CHECK_SIZEOF(short) ++ AC_CHECK_SIZEOF(int) ++ AC_CHECK_SIZEOF(long) ++ AC_CHECK_SIZEOF(void*) ++ ac_cv_stdint_char_model="" ++ ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_char" ++ ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_short" ++ ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_int" ++ ac_cv_stdint_long_model="" ++ ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_int" ++ ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_long" ++ ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_voidp" ++ name="$ac_cv_stdint_long_model" ++ case "$ac_cv_stdint_char_model/$ac_cv_stdint_long_model" in ++ 122/242) name="$name, IP16 (standard 16bit machine)" ;; ++ 122/244) name="$name, LP32 (standard 32bit mac/win)" ;; ++ 122/*) name="$name (unusual int16 model)" ;; ++ 124/444) name="$name, ILP32 (standard 32bit unixish)" ;; ++ 124/488) name="$name, LP64 (standard 64bit unixish)" ;; ++ 124/448) name="$name, LLP64 (unusual 64bit unixish)" ;; ++ 124/*) name="$name (unusual int32 model)" ;; ++ 128/888) name="$name, ILP64 (unusual 64bit numeric)" ;; ++ 128/*) name="$name (unusual int64 model)" ;; ++ 222/*|444/*) name="$name (unusual dsptype)" ;; ++ *) name="$name (very unusal model)" ;; ++ esac ++ AC_MSG_RESULT([combined for stdint datatype model... $name]) ++fi ++ ++if test "_$ac_cv_header_stdint_x" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_x" ++elif test "_$ac_cv_header_stdint_o" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_o" ++elif test "_$ac_cv_header_stdint_u" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_u" ++else ++ ac_cv_header_stdint="stddef.h" ++fi ++ ++AC_MSG_CHECKING([for extra inttypes in chosen header]) ++AC_MSG_RESULT([($ac_cv_header_stdint)]) ++dnl see if int_least and int_fast types are present in _this_ header. ++unset ac_cv_type_int_least32_t ++unset ac_cv_type_int_fast32_t ++AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>]) ++AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>]) ++AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>]) ++ ++fi # shortcircut to system "stdint.h" ++# ------------------ PREPARE VARIABLES ------------------------------ ++if test "$GCC" = "yes" ; then ++ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` ++else ++ac_cv_stdint_message="using $CC" ++fi ++ ++AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl ++$ac_cv_stdint_result]) ++ ++# ----------------- DONE inttypes.h checks START header ------------- ++AC_CONFIG_COMMANDS([$ac_stdint_h],[ ++AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h) ++ac_stdint=$tmp/_stdint.h ++ ++echo "#ifndef" $_ac_stdint_h >$ac_stdint ++echo "#define" $_ac_stdint_h "1" >>$ac_stdint ++echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint ++echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint ++echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint ++if test "_$ac_cv_header_stdint_t" != "_" ; then ++echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint ++fi ++ ++cat >>$ac_stdint < ++#else ++#include ++ ++/* .................... configured part ............................ */ ++ ++STDINT_EOF ++ ++echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint ++if test "_$ac_cv_header_stdint_x" != "_" ; then ++ ac_header="$ac_cv_header_stdint_x" ++ echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint ++else ++ echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint ++fi ++ ++echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint ++if test "_$ac_cv_header_stdint_o" != "_" ; then ++ ac_header="$ac_cv_header_stdint_o" ++ echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint ++else ++ echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint ++fi ++ ++echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint ++if test "_$ac_cv_header_stdint_u" != "_" ; then ++ ac_header="$ac_cv_header_stdint_u" ++ echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint ++else ++ echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint ++fi ++ ++echo "" >>$ac_stdint ++ ++if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then ++ echo "#include <$ac_header>" >>$ac_stdint ++ echo "" >>$ac_stdint ++fi fi ++ ++echo "/* which 64bit typedef has been found */" >>$ac_stdint ++if test "$ac_cv_type_uint64_t" = "yes" ; then ++echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint ++else ++echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint ++fi ++if test "$ac_cv_type_u_int64_t" = "yes" ; then ++echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint ++else ++echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint ++fi ++echo "" >>$ac_stdint ++ ++echo "/* which type model has been detected */" >>$ac_stdint ++if test "_$ac_cv_stdint_char_model" != "_" ; then ++echo "#define _STDINT_CHAR_MODEL" "$ac_cv_stdint_char_model" >>$ac_stdint ++echo "#define _STDINT_LONG_MODEL" "$ac_cv_stdint_long_model" >>$ac_stdint ++else ++echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint ++echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint ++fi ++echo "" >>$ac_stdint ++ ++echo "/* whether int_least types were detected */" >>$ac_stdint ++if test "$ac_cv_type_int_least32_t" = "yes"; then ++echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint ++else ++echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint ++fi ++echo "/* whether int_fast types were detected */" >>$ac_stdint ++if test "$ac_cv_type_int_fast32_t" = "yes"; then ++echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint ++else ++echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint ++fi ++echo "/* whether intmax_t type was detected */" >>$ac_stdint ++if test "$ac_cv_type_intmax_t" = "yes"; then ++echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint ++else ++echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint ++fi ++echo "" >>$ac_stdint ++ ++ cat >>$ac_stdint <= 199901L ++#define _HAVE_UINT64_T ++typedef long long int64_t; ++typedef unsigned long long uint64_t; ++ ++#elif !defined __STRICT_ANSI__ ++#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ ++#define _HAVE_UINT64_T ++typedef __int64 int64_t; ++typedef unsigned __int64 uint64_t; ++ ++#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__ ++/* note: all ELF-systems seem to have loff-support which needs 64-bit */ ++#if !defined _NO_LONGLONG ++#define _HAVE_UINT64_T ++typedef long long int64_t; ++typedef unsigned long long uint64_t; ++#endif ++ ++#elif defined __alpha || (defined __mips && defined _ABIN32) ++#if !defined _NO_LONGLONG ++typedef long int64_t; ++typedef unsigned long uint64_t; ++#endif ++ /* compiler/cpu type to define int64_t */ ++#endif ++#endif ++#endif ++ ++#if defined _STDINT_HAVE_U_INT_TYPES ++/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */ ++typedef u_int8_t uint8_t; ++typedef u_int16_t uint16_t; ++typedef u_int32_t uint32_t; ++ ++/* glibc compatibility */ ++#ifndef __int8_t_defined ++#define __int8_t_defined ++#endif ++#endif ++ ++#ifdef _STDINT_NEED_INT_MODEL_T ++/* we must guess all the basic types. Apart from byte-adressable system, */ ++/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */ ++/* (btw, those nibble-addressable systems are way off, or so we assume) */ ++ ++dnl /* have a look at "64bit and data size neutrality" at */ ++dnl /* http://unix.org/version2/whatsnew/login_64bit.html */ ++dnl /* (the shorthand "ILP" types always have a "P" part) */ ++ ++#if defined _STDINT_BYTE_MODEL ++#if _STDINT_LONG_MODEL+0 == 242 ++/* 2:4:2 = IP16 = a normal 16-bit system */ ++typedef unsigned char uint8_t; ++typedef unsigned short uint16_t; ++typedef unsigned long uint32_t; ++#ifndef __int8_t_defined ++#define __int8_t_defined ++typedef char int8_t; ++typedef short int16_t; ++typedef long int32_t; ++#endif ++#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444 ++/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */ ++/* 4:4:4 = ILP32 = a normal 32-bit system */ ++typedef unsigned char uint8_t; ++typedef unsigned short uint16_t; ++typedef unsigned int uint32_t; ++#ifndef __int8_t_defined ++#define __int8_t_defined ++typedef char int8_t; ++typedef short int16_t; ++typedef int int32_t; ++#endif ++#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488 ++/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */ ++/* 4:8:8 = LP64 = a normal 64-bit system */ ++typedef unsigned char uint8_t; ++typedef unsigned short uint16_t; ++typedef unsigned int uint32_t; ++#ifndef __int8_t_defined ++#define __int8_t_defined ++typedef char int8_t; ++typedef short int16_t; ++typedef int int32_t; ++#endif ++/* this system has a "long" of 64bit */ ++#ifndef _HAVE_UINT64_T ++#define _HAVE_UINT64_T ++typedef unsigned long uint64_t; ++typedef long int64_t; ++#endif ++#elif _STDINT_LONG_MODEL+0 == 448 ++/* LLP64 a 64-bit system derived from a 32-bit system */ ++typedef unsigned char uint8_t; ++typedef unsigned short uint16_t; ++typedef unsigned int uint32_t; ++#ifndef __int8_t_defined ++#define __int8_t_defined ++typedef char int8_t; ++typedef short int16_t; ++typedef int int32_t; ++#endif ++/* assuming the system has a "long long" */ ++#ifndef _HAVE_UINT64_T ++#define _HAVE_UINT64_T ++typedef unsigned long long uint64_t; ++typedef long long int64_t; ++#endif ++#else ++#define _STDINT_NO_INT32_T ++#endif ++#else ++#define _STDINT_NO_INT8_T ++#define _STDINT_NO_INT32_T ++#endif ++#endif ++ ++/* ++ * quote from SunOS-5.8 sys/inttypes.h: ++ * Use at your own risk. As of February 1996, the committee is squarely ++ * behind the fixed sized types; the "least" and "fast" types are still being ++ * discussed. The probability that the "fast" types may be removed before ++ * the standard is finalized is high enough that they are not currently ++ * implemented. ++ */ ++ ++#if defined _STDINT_NEED_INT_LEAST_T ++typedef int8_t int_least8_t; ++typedef int16_t int_least16_t; ++typedef int32_t int_least32_t; ++#ifdef _HAVE_UINT64_T ++typedef int64_t int_least64_t; ++#endif ++ ++typedef uint8_t uint_least8_t; ++typedef uint16_t uint_least16_t; ++typedef uint32_t uint_least32_t; ++#ifdef _HAVE_UINT64_T ++typedef uint64_t uint_least64_t; ++#endif ++ /* least types */ ++#endif ++ ++#if defined _STDINT_NEED_INT_FAST_T ++typedef int8_t int_fast8_t; ++typedef int int_fast16_t; ++typedef int32_t int_fast32_t; ++#ifdef _HAVE_UINT64_T ++typedef int64_t int_fast64_t; ++#endif ++ ++typedef uint8_t uint_fast8_t; ++typedef unsigned uint_fast16_t; ++typedef uint32_t uint_fast32_t; ++#ifdef _HAVE_UINT64_T ++typedef uint64_t uint_fast64_t; ++#endif ++ /* fast types */ ++#endif ++ ++#ifdef _STDINT_NEED_INTMAX_T ++#ifdef _HAVE_UINT64_T ++typedef int64_t intmax_t; ++typedef uint64_t uintmax_t; ++#else ++typedef long intmax_t; ++typedef unsigned long uintmax_t; ++#endif ++#endif ++ ++#ifdef _STDINT_NEED_INTPTR_T ++#ifndef __intptr_t_defined ++#define __intptr_t_defined ++/* we encourage using "long" to store pointer values, never use "int" ! */ ++#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484 ++typedef unsinged int uintptr_t; ++typedef int intptr_t; ++#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444 ++typedef unsigned long uintptr_t; ++typedef long intptr_t; ++#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T ++typedef uint64_t uintptr_t; ++typedef int64_t intptr_t; ++#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */ ++typedef unsigned long uintptr_t; ++typedef long intptr_t; ++#endif ++#endif ++#endif ++ ++ /* shortcircuit*/ ++#endif ++ /* once */ ++#endif ++#endif ++STDINT_EOF ++ if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then ++ AC_MSG_NOTICE([$ac_stdint_h is unchanged]) ++ else ++ ac_dir=`AS_DIRNAME(["$ac_stdint_h"])` ++ AS_MKDIR_P(["$ac_dir"]) ++ rm -f $ac_stdint_h ++ mv $ac_stdint $ac_stdint_h ++ fi ++],[# variables for create stdint.h replacement ++PACKAGE="$PACKAGE" ++VERSION="$VERSION" ++ac_stdint_h="$ac_stdint_h" ++_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h) ++ac_cv_stdint_message="$ac_cv_stdint_message" ++ac_cv_header_stdint_t="$ac_cv_header_stdint_t" ++ac_cv_header_stdint_x="$ac_cv_header_stdint_x" ++ac_cv_header_stdint_o="$ac_cv_header_stdint_o" ++ac_cv_header_stdint_u="$ac_cv_header_stdint_u" ++ac_cv_type_uint64_t="$ac_cv_type_uint64_t" ++ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" ++ac_cv_stdint_char_model="$ac_cv_stdint_char_model" ++ac_cv_stdint_long_model="$ac_cv_stdint_long_model" ++ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" ++ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" ++ac_cv_type_intmax_t="$ac_cv_type_intmax_t" ++]) ++]) diff --git a/package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch b/package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch new file mode 100644 index 0000000000..c70ba450e1 --- /dev/null +++ b/package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch @@ -0,0 +1,84 @@ +From 7508bb15de94b38402152757f75ff3e2094fdd86 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Sun, 9 Mar 2014 13:27:03 +0100 +Subject: [PATCH 4/5] Added-auto-generated-nettle-config.h + +--- + Makefile.in | 4 ++-- + bignum.h | 1 + + configure.ac | 1 + + examples/ecc-benchmark.c | 1 + + nettle-config.h.in | 6 ++++++ + testsuite/testutils.h | 1 + + 7 files changed, 13 insertions(+), 2 deletions(-) + create mode 100644 nettle-config.h.in + +--- a/Makefile.in ++++ b/Makefile.in +@@ -178,7 +178,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1. + ecc-curve.h ecc.h ecdsa.h \ + gcm.h gosthash94.h hmac.h \ + knuth-lfib.h \ +- macros.h \ ++ macros.h nettle-config.h \ + md2.h md4.h \ + md5.h md5-compat.h \ + memxor.h \ +@@ -203,7 +203,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt + config.h.in config.m4.in config.make.in Makefile.in \ + README AUTHORS COPYING.LESSERv3 COPYINGv2 COPYINGv3 \ + INSTALL NEWS TODO ChangeLog \ +- nettle.pc.in hogweed.pc.in \ ++ nettle.pc.in hogweed.pc.in nettle-config.h.in \ + $(des_headers) descore.README \ + aes-internal.h camellia-internal.h serpent-internal.h \ + cast128_sboxes.h desinfo.h desCode.h \ +--- a/bignum.h ++++ b/bignum.h +@@ -34,6 +34,7 @@ + #ifndef NETTLE_BIGNUM_H_INCLUDED + #define NETTLE_BIGNUM_H_INCLUDED + ++#include "nettle-config.h" + #include "nettle-meta.h" + + #ifdef USE_MINI_GMP +--- a/configure.ac ++++ b/configure.ac +@@ -10,6 +10,7 @@ AC_CONFIG_AUX_DIR([.]) + AC_CONFIG_MACRO_DIR([.]) + + AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADER([nettle-config.h]) + + LIBNETTLE_MAJOR=5 + LIBNETTLE_MINOR=0 +--- a/examples/ecc-benchmark.c ++++ b/examples/ecc-benchmark.c +@@ -47,6 +47,7 @@ + #include "timing.h" + + #undef USE_MINI_GMP ++#define NETTLE_CONFIG_H_INCLUDED + #include + #include "../ecc.h" + #include "../ecc-internal.h" +--- /dev/null ++++ b/nettle-config.h.in +@@ -0,0 +1,6 @@ ++#ifndef NETTLE_CONFIG_H_INCLUDED ++#define NETTLE_CONFIG_H_INCLUDED ++ ++#undef USE_MINI_GMP ++ ++#endif +--- a/testsuite/testutils.h ++++ b/testsuite/testutils.h +@@ -15,6 +15,7 @@ + + #if WITH_HOGWEED + # include ++# define NETTLE_CONFIG_H_INCLUDED + # undef USE_MINI_GMP + # include "rsa.h" + # include "dsa-compat.h" diff --git a/package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch b/package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch new file mode 100644 index 0000000000..ef282623f6 --- /dev/null +++ b/package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch @@ -0,0 +1,29 @@ +From d71b3138cbdc3852c96a2639995f2d7f44b1c76c Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Sat, 29 Mar 2014 09:12:41 +0100 +Subject: [PATCH 5/5] allow der-iterator to be used with mini-gmp + +--- + der-iterator.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/der-iterator.c ++++ b/der-iterator.c +@@ -38,7 +38,7 @@ + #include + #include + +-#if HAVE_LIBGMP ++#if defined(HAVE_LIBGMP) || defined(USE_MINI_GMP) + #include "bignum.h" + #endif + +@@ -254,7 +254,7 @@ asn1_der_get_uint32(struct asn1_der_iter + return 1; + } + +-#if HAVE_LIBGMP ++#if defined(HAVE_LIBGMP) || defined(USE_MINI_GMP) + int + asn1_der_get_bignum(struct asn1_der_iterator *i, + mpz_t x, unsigned max_bits) -- 2.11.0