- includes and have_ssl fixes for nss.

git-svn-id: file:///svn/unbound/trunk@2830 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 4bddb6831bc065d7670290263e9bc37603d659ee..49820e4c8730d82f90f6df3376b23ede2ae302c5 100755 (executable)
--- a/configure
+++ b/configure
@@ -16009,8 +16009,8 @@ if test "${with_nss+set}" = set; then :
 
 $as_echo "#define HAVE_NSS 1" >>confdefs.h
 
-       if test "$withval" != "/usr" -a "$withval" != "" -a "$withval" != "yes"; then
-               CPPFLAGS="$CPPFLAGS -I$withval/include"
+       if test "$withval" != "" -a "$withval" != "yes"; then
+               CPPFLAGS="$CPPFLAGS -I$withval/include/nss3"
                LDFLAGS="$LDFLAGS -L$withval/lib"
 
        if test "x$enable_rpath" = xyes; then
@@ -16021,6 +16021,7 @@ $as_echo "#define HAVE_NSS 1" >>confdefs.h
 
                CPPFLAGS="-I$withval/include/nspr4 $CPPFLAGS"
        else
+               CPPFLAGS="$CPPFLAGS -I/usr/include/nss3"
                CPPFLAGS="-I/usr/include/nspr4 $CPPFLAGS"
        fi
         LIBS="$LIBS -lnss3 -lnspr4"

diff --git a/configure.ac b/configure.ac
index b24c7d1d91a1ccf6097e8195eb5aa9dcfe7b81d3..b07c5cb42ce68f9983f4090710ffade637097d3f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -525,12 +525,13 @@ AC_ARG_WITH([nss], AC_HELP_STRING([--with-nss=path],
        [
        USE_NSS="yes"
        AC_DEFINE(HAVE_NSS, 1, [Use libnss for crypto])
-       if test "$withval" != "/usr" -a "$withval" != "" -a "$withval" != "yes"; then
-               CPPFLAGS="$CPPFLAGS -I$withval/include"
+       if test "$withval" != "" -a "$withval" != "yes"; then
+               CPPFLAGS="$CPPFLAGS -I$withval/include/nss3"
                LDFLAGS="$LDFLAGS -L$withval/lib"
                ACX_RUNTIME_PATH_ADD([$withval/lib])
                CPPFLAGS="-I$withval/include/nspr4 $CPPFLAGS"
        else
+               CPPFLAGS="$CPPFLAGS -I/usr/include/nss3"
                CPPFLAGS="-I/usr/include/nspr4 $CPPFLAGS"
        fi
         LIBS="$LIBS -lnss3 -lnspr4"

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 36aab9b18ac9e4e8280dc966e0cab065bfd65797..61258174fddb1ed815bb886c1565f34ed3dbf5d1 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -57,7 +57,8 @@
 #endif
 
 #ifdef HAVE_NSS
-#include <nss3/nss.h>
+/* nss3 */
+#include "nss.h"
 #endif
 
 #include <ldns/ldns.h>

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 377396fc4d01a2fc83b269beb33d60393dc5fed5..cd08c9c3f185451408f78b610c6d73c3713a4beb 100644 (file)
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -88,7 +88,8 @@
 #endif
 
 #ifdef HAVE_NSS
-#  include <nss3/nss.h>
+/* nss3 */
+#  include "nss.h"
 #endif
 
 /** global debug value to keep track of heap memory allocation */

diff --git a/doc/Changelog b/doc/Changelog
index 13c17ed2b42fd041e331258bf5038aa2ccc1cda0..3ffa4f7a704826de60c4b232f6961ce3c6e4b8af 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 January 2013: Wouter
+       - includes and have_ssl fixes for nss.
+
 29 January 2013: Wouter
        - printout name of zone with duplicate fwd and hint errors.
 

diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index e3da24dd8ed6d13cf4873ed6bd393b32490516d6..e547f4dbf98d7e148526e6325a3c441bf6af7761 100644 (file)
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -44,7 +44,9 @@
 #include "config.h"
 #include <ldns/dname.h>
 #include <ldns/wire2host.h>
+#ifdef HAVE_SSL
 #include <openssl/ssl.h>
+#endif
 #include "libunbound/libworker.h"
 #include "libunbound/context.h"
 #include "libunbound/unbound.h"
@@ -88,7 +90,9 @@ libworker_delete(struct libworker* w)
                ub_randfree(w->env->rnd);
                free(w->env);
        }
+#ifdef HAVE_SSL
        SSL_CTX_free(w->sslctx);
+#endif
        outside_network_delete(w->back);
        comm_base_delete(w->base);
        free(w);

diff --git a/smallapp/unbound-host.c b/smallapp/unbound-host.c
index ed52a551f9fc1c24af20e2a392b26e7338e20615..715aa4a6516bc9cff4df1f9fdc9ef73ce7eefd0d 100644 (file)
--- a/smallapp/unbound-host.c
+++ b/smallapp/unbound-host.c
@@ -62,7 +62,8 @@
 #include "libunbound/unbound.h"
 #include <ldns/ldns.h>
 #ifdef HAVE_NSS
-#include <nss3/nss.h>
+/* nss3 */
+#include "nss.h"
 #endif
 
 /** verbosity for unbound-host app */

diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 6dcb95eb9f0e6c29c7dc1f0717879f4a9daef1a4..122f09b86149c53c5a2e75913e95c84b41ef49a0 100644 (file)
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -57,7 +57,8 @@
 #endif
 
 #ifdef HAVE_NSS
-#include "nss3/nss.h"
+/* nss3 */
+#include "nss.h"
 #endif
 
 #include <ldns/ldns.h>

diff --git a/util/random.c b/util/random.c
index 5b61aef7f3bdbedfb94bd7d53fa37e4cd1f48f7e..5d71fcfa4c12d0460fec8ab63b487b8ff7f9041c 100644 (file)
--- a/util/random.c
+++ b/util/random.c
@@ -65,9 +65,11 @@
 #include <openssl/rc4.h>
 #include <openssl/err.h>
 #elif defined(HAVE_NSS)
-#include <nspr4/prerror.h>
-#include <nss3/secport.h>
-#include <nss3/pk11pub.h>
+/* nspr4 */
+#include "prerror.h"
+/* nss3 */
+#include "secport.h"
+#include "pk11pub.h"
 #endif
 
 /** 

diff --git a/validator/val_nsec3.c b/validator/val_nsec3.c
index 2a2cfcf9b2d5c1a14831b49277d6d53e70b7c978..4b48e7beed6024b56e1f5c2afa98e6ef28657f33 100644 (file)
--- a/validator/val_nsec3.c
+++ b/validator/val_nsec3.c
@@ -46,7 +46,8 @@
 #include "openssl/ssl.h"
 #endif
 #ifdef HAVE_NSS
-#include <nss3/sechash.h>
+/* nss3 */
+#include "sechash.h"
 #endif
 #include "validator/val_nsec3.h"
 #include "validator/validator.h"

diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c
index 676399733553907555b51c7a0e88cd6706deff5b..5cca578b1be150b0d6baff58bff13e383a65b8c9 100644 (file)
--- a/validator/val_secalgo.c
+++ b/validator/val_secalgo.c
@@ -553,12 +553,14 @@ verify_canonrrset(ldns_buffer* buf, int algo, unsigned char* sigblock,
 /**************************************************/
 #elif defined(HAVE_NSS)
 /* libnss implementation */
-#include <nss3/sechash.h>
-#include <nss3/pk11pub.h>
-#include <nss3/keyhi.h>
-#include <nss3/secerr.h>
-#include <nss3/cryptohi.h>
-#include <nspr4/prerror.h>
+/* nss3 */
+#include "sechash.h"
+#include "pk11pub.h"
+#include "keyhi.h"
+#include "secerr.h"
+#include "cryptohi.h"
+/* nspr4 */
+#include "prerror.h"
 
 size_t
 ds_digest_size_supported(int algo)