You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2010/10/26 16:57:32 UTC
svn commit: r1027584 - in /santuario/trunk/c: ./ xsec/enc/NSS/
Author: scantor
Date: Tue Oct 26 14:57:31 2010
New Revision: 1027584
URL: http://svn.apache.org/viewvc?rev=1027584&view=rev
Log:
Remove nss3 prefix from NSS headers.
Modified:
santuario/trunk/c/configure.ac
santuario/trunk/c/xsec/enc/NSS/NSSCryptoHash.hpp
santuario/trunk/c/xsec/enc/NSS/NSSCryptoHashHMAC.hpp
santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyDSA.hpp
santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyHMAC.hpp
santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyRSA.hpp
santuario/trunk/c/xsec/enc/NSS/NSSCryptoProvider.hpp
santuario/trunk/c/xsec/enc/NSS/NSSCryptoSymmetricKey.hpp
santuario/trunk/c/xsec/enc/NSS/NSSCryptoX509.hpp
Modified: santuario/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/santuario/trunk/c/configure.ac?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/configure.ac (original)
+++ santuario/trunk/c/configure.ac Tue Oct 26 14:57:31 2010
@@ -481,9 +481,10 @@ if test x"$use_nss" != "xno" ; then
fi
else
if test x_$use_nss != x_/usr; then
- NSSFLAGS="-I${use_nss}/include"
NSSLIBS="-L${use_nss}/lib"
fi
+ # NSS is broken and doesn't use a standard include path.
+ NSSFLAGS="-I${use_nss}/include/nss3 -I${use_nss}/include/nss"
NSSLIBS="$NSSLIBS -lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4"
fi
@@ -491,7 +492,7 @@ if test x"$use_nss" != "xno" ; then
AC_MSG_RESULT($NSSFLAGS)
CPPFLAGS="$CPPFLAGS $NSSFLAGS"
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <nss3/nss.h>]])],
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <nss.h>]])],
[AC_DEFINE([XSEC_HAVE_NSS],[1],[Define if NSS is in use.])],
[AC_MSG_ERROR([Unable to find NSS headers])])
@@ -499,7 +500,7 @@ if test x"$use_nss" != "xno" ; then
AC_MSG_RESULT($NSSLIBS)
LIBS="$LIBS $NSSLIBS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nss3/nss.h>]], [[NSS_NoDB_Init(NULL);]])],,
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nss.h>]], [[NSS_NoDB_Init(NULL);]])],,
[AC_MSG_ERROR([Unable to link with NSS])])
fi
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoHash.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoHash.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoHash.hpp Tue Oct 26 14:57:31 2010
@@ -31,8 +31,8 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/pk11func.h>
-#include <nss3/nss.h>
+#include <pk11func.h>
+#include <nss.h>
/**
* @ingroup nsscrypto
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoHashHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoHashHMAC.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoHashHMAC.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoHashHMAC.hpp Tue Oct 26 14:57:31 2010
@@ -31,8 +31,8 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/pk11func.h>
-#include <nss3/nss.h>
+#include <pk11func.h>
+#include <nss.h>
/**
* @ingroup nsscrypto
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyDSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyDSA.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyDSA.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyDSA.hpp Tue Oct 26 14:57:31 2010
@@ -30,9 +30,9 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/pk11func.h>
-#include <nss3/keyhi.h>
-#include <nss3/nss.h>
+#include <pk11func.h>
+#include <keyhi.h>
+#include <nss.h>
class NSSCryptoProvider;
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyHMAC.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyHMAC.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyHMAC.hpp Tue Oct 26 14:57:31 2010
@@ -30,8 +30,8 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/pk11func.h>
-#include <nss3/nss.h>
+#include <pk11func.h>
+#include <nss.h>
/**
* \ingroup nsscrypto
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyRSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyRSA.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyRSA.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoKeyRSA.hpp Tue Oct 26 14:57:31 2010
@@ -30,9 +30,9 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/pk11func.h>
-#include <nss3/keyhi.h>
-#include <nss3/nss.h>
+#include <pk11func.h>
+#include <keyhi.h>
+#include <nss.h>
class NSSCryptoProvider;
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoProvider.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoProvider.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoProvider.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoProvider.hpp Tue Oct 26 14:57:31 2010
@@ -31,8 +31,8 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/pk11func.h>
-#include <nss3/nss.h>
+#include <pk11func.h>
+#include <nss.h>
/**
* @defgroup nsscrypto NSS Interface
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoSymmetricKey.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoSymmetricKey.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoSymmetricKey.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoSymmetricKey.hpp Tue Oct 26 14:57:31 2010
@@ -32,8 +32,8 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/pk11func.h>
-#include <nss3/nss.h>
+#include <pk11func.h>
+#include <nss.h>
#define NSS_MAX_BLOCK_SIZE 32
Modified: santuario/trunk/c/xsec/enc/NSS/NSSCryptoX509.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/enc/NSS/NSSCryptoX509.hpp?rev=1027584&r1=1027583&r2=1027584&view=diff
==============================================================================
--- santuario/trunk/c/xsec/enc/NSS/NSSCryptoX509.hpp (original)
+++ santuario/trunk/c/xsec/enc/NSS/NSSCryptoX509.hpp Tue Oct 26 14:57:31 2010
@@ -31,7 +31,7 @@
#if defined (XSEC_HAVE_NSS)
-#include <nss3/cert.h>
+#include <cert.h>
class NSSCryptoProvider;