0004-Added-auto-generated-nettle-config.h.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384
  1. From 7508bb15de94b38402152757f75ff3e2094fdd86 Mon Sep 17 00:00:00 2001
  2. From: Nikos Mavrogiannopoulos <[email protected]>
  3. Date: Sun, 9 Mar 2014 13:27:03 +0100
  4. Subject: [PATCH 4/5] Added-auto-generated-nettle-config.h
  5. ---
  6. Makefile.in | 4 ++--
  7. bignum.h | 1 +
  8. configure.ac | 1 +
  9. examples/ecc-benchmark.c | 1 +
  10. nettle-config.h.in | 6 ++++++
  11. testsuite/testutils.h | 1 +
  12. 7 files changed, 13 insertions(+), 2 deletions(-)
  13. create mode 100644 nettle-config.h.in
  14. --- a/Makefile.in
  15. +++ b/Makefile.in
  16. @@ -178,7 +178,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.
  17. ecc-curve.h ecc.h ecdsa.h \
  18. gcm.h gosthash94.h hmac.h \
  19. knuth-lfib.h \
  20. - macros.h \
  21. + macros.h nettle-config.h \
  22. md2.h md4.h \
  23. md5.h md5-compat.h \
  24. memxor.h \
  25. @@ -203,7 +203,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt
  26. config.h.in config.m4.in config.make.in Makefile.in \
  27. README AUTHORS COPYING.LESSERv3 COPYINGv2 COPYINGv3 \
  28. INSTALL NEWS TODO ChangeLog \
  29. - nettle.pc.in hogweed.pc.in \
  30. + nettle.pc.in hogweed.pc.in nettle-config.h.in \
  31. $(des_headers) descore.README \
  32. aes-internal.h camellia-internal.h serpent-internal.h \
  33. cast128_sboxes.h desinfo.h desCode.h \
  34. --- a/bignum.h
  35. +++ b/bignum.h
  36. @@ -34,6 +34,7 @@
  37. #ifndef NETTLE_BIGNUM_H_INCLUDED
  38. #define NETTLE_BIGNUM_H_INCLUDED
  39. +#include "nettle-config.h"
  40. #include "nettle-meta.h"
  41. #ifdef USE_MINI_GMP
  42. --- a/configure.ac
  43. +++ b/configure.ac
  44. @@ -10,6 +10,7 @@ AC_CONFIG_AUX_DIR([.])
  45. AC_CONFIG_MACRO_DIR([.])
  46. AC_CONFIG_HEADER([config.h])
  47. +AC_CONFIG_HEADER([nettle-config.h])
  48. LIBNETTLE_MAJOR=5
  49. LIBNETTLE_MINOR=0
  50. --- a/examples/ecc-benchmark.c
  51. +++ b/examples/ecc-benchmark.c
  52. @@ -47,6 +47,7 @@
  53. #include "timing.h"
  54. #undef USE_MINI_GMP
  55. +#define NETTLE_CONFIG_H_INCLUDED
  56. #include <gmp.h>
  57. #include "../ecc.h"
  58. #include "../ecc-internal.h"
  59. --- /dev/null
  60. +++ b/nettle-config.h.in
  61. @@ -0,0 +1,6 @@
  62. +#ifndef NETTLE_CONFIG_H_INCLUDED
  63. +#define NETTLE_CONFIG_H_INCLUDED
  64. +
  65. +#undef USE_MINI_GMP
  66. +
  67. +#endif
  68. --- a/testsuite/testutils.h
  69. +++ b/testsuite/testutils.h
  70. @@ -15,6 +15,7 @@
  71. #if WITH_HOGWEED
  72. # include <gmp.h>
  73. +# define NETTLE_CONFIG_H_INCLUDED
  74. # undef USE_MINI_GMP
  75. # include "rsa.h"
  76. # include "dsa-compat.h"