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/09/29 23:16:50 UTC
svn commit: r1002847 [1/2] - in /santuario/trunk/c: ./ lib/ m4/ src/enc/NSS/
src/enc/OpenSSL/ src/enc/WinCAPI/ src/framework/ src/tools/checksig/
src/tools/cipher/ src/tools/templatesign/ src/tools/threadTest/
src/tools/xklient/ src/tools/xtest/ src/ut...
Author: scantor
Date: Wed Sep 29 21:16:44 2010
New Revision: 1002847
URL: http://svn.apache.org/viewvc?rev=1002847&view=rev
Log:
Modernize autoconf usage, remove generated files, rename crypto macros, add NSS support to build.
Removed:
santuario/trunk/c/aclocal.m4
santuario/trunk/c/src/framework/XSECConfig.hpp.in
Modified:
santuario/trunk/c/Makefile.am
santuario/trunk/c/configure.ac
santuario/trunk/c/lib/Makefile.am
santuario/trunk/c/m4/acx_pthread.m4
santuario/trunk/c/src/enc/NSS/NSSCryptoHash.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoHash.hpp
santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.hpp
santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.hpp
santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.hpp
santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.hpp
santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.hpp
santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.hpp
santuario/trunk/c/src/enc/NSS/NSSCryptoX509.cpp
santuario/trunk/c/src/enc/NSS/NSSCryptoX509.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp
santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.cpp
santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.hpp
santuario/trunk/c/src/framework/XSECW32Config.hpp
santuario/trunk/c/src/tools/checksig/InteropResolver.cpp
santuario/trunk/c/src/tools/checksig/InteropResolver.hpp
santuario/trunk/c/src/tools/checksig/checksig.cpp
santuario/trunk/c/src/tools/cipher/XencInteropResolver.cpp
santuario/trunk/c/src/tools/cipher/cipher.cpp
santuario/trunk/c/src/tools/templatesign/templatesign.cpp
santuario/trunk/c/src/tools/threadTest/threadtest.cpp
santuario/trunk/c/src/tools/xklient/xklient.cpp
santuario/trunk/c/src/tools/xtest/xtest.cpp
santuario/trunk/c/src/utils/XSECPlatformUtils.cpp
Modified: santuario/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/santuario/trunk/c/Makefile.am?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/Makefile.am (original)
+++ santuario/trunk/c/Makefile.am Wed Sep 29 21:16:44 2010
@@ -1,5 +1,5 @@
#
-# Copyright 2006 The Apache Software Foundation.
+# Copyright 2006-2010 The Apache Software Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = include lib bin
-ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = m4/acx_pthread.m4 Projects xml-security-c.spec \
src/framework/resource.h \
Modified: santuario/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/santuario/trunk/c/configure.ac?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/configure.ac (original)
+++ santuario/trunk/c/configure.ac Wed Sep 29 21:16:44 2010
@@ -1,4 +1,4 @@
-# Copyright 2002-2006 The Apache Software Foundation.
+# Copyright 2002-2010 The Apache Software Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,461 +17,124 @@
# designed to handle different system complexity than make
#
-# Process this file with autoconf to produce a configure script
-
-AC_INIT([[XML-Security-C]], [1.6.0], [security-dev@xml.apache.org], [xml-security-c])
-AC_CONFIG_AUX_DIR([config])
-
-# kick off automake
-
-AM_INIT_AUTOMAKE(xml-security-c, 1.6.0)
-sinclude(m4/acx_pthread.m4)
-AM_PROG_LIBTOOL
-
-# We want to control the autotools invocation
-
-AM_MAINTAINER_MODE
-
-# framework is a unique directory in src/ - allows configure to check
-# it is running in the correct directory
-
+# Process this file with autoreconf
+AC_PREREQ(2.60)
+AC_INIT([[XML-Security-C]],[1.6.0],[santuario-dev@apache.org],[xml-security-c])
AC_CONFIG_SRCDIR(src)
+AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR(m4)
+AM_INIT_AUTOMAKE
+LT_INIT
-# Define the files we wish to generate
-
-AC_CONFIG_FILES([Makefile\
- lib/Makefile \
- include/Makefile \
- bin/Makefile ])
-
-# AC_CONFIG_FILES([Makefile canon/Makefile transformers/Makefile dsig/Makefile enc/Makefile enc/OpenSSL/Makefile framework/Makefile utils/Makefile utils/unixutils/Makefile tools/Makefile samples/Makefile])
-AC_CONFIG_HEADERS([src/framework/XSECConfig.hpp])
-
-# Get user options
-
-AC_ARG_WITH(xerces,
- AC_HELP_STRING(--with-xerces,
- [Define Xerces directory. Values = 'yes' or installation directory. 'No' is not permitted (Default = yes)]),
- use_xerces=$withval, use_xerces=yes)
-
-if test x"$use_xerces" != "xyes" ; then
- if test x"$use_xerces" != "xno" ; then
- XERCESCROOT=$use_xerces
- else
- AC_MSG_ERROR([Cannot configure without Xerces])
- fi
-fi
-
-
-AC_ARG_WITH(xalan,
- AC_HELP_STRING(--with-xalan,
- [Enable Xalan integration. Values = 'yes' or installation directory (Default = yes)]),
- use_xalan=$withval, use_xalan=yes)
+AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]),
+ enable_debug=$enableval, enable_debug=no)
-if test x"$use_xalan" != "xyes" ; then
- if test x"$use_xalan" != "xno" ; then
- XALANCROOT=$use_xalan
- fi
+if test "$enable_debug" = "yes" ; then
+ GCC_CFLAGS="$CFLAGS -g -D_DEBUG"
+ GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG"
+else
+ GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG"
+ GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
fi
-AC_ARG_WITH(openssl,
- AC_HELP_STRING(--with-openssl,
- [Use Openssl. Values = 'yes' or installation directory (Default = yes)]),
- use_openssl=$withval, use_openssl=yes)
-if test x"$use_openssl" != "xyes" ; then
- if test x"$use_openssl" != "xno" ; then
- # Must be the source directory
- OPENSSL=$use_openssl
- fi
-fi
+# Define the files we wish to generate
-AC_ARG_ENABLE(debug,
- AC_HELP_STRING(--enable-debug,
- [Compile a version of the library with symbols (Default = no)]),
- enable_debug=$enableval, enable_debug=no)
-
-# As of version 1.3, by default treat warnings as errors
-
-AC_ARG_ENABLE(warnerror,
- AC_HELP_STRING(--enable-warnerrer,
- [Treat warnings as errors during compile (Default = no)]),
- enable_warnerror=$enableval, enable_warnerror=no)
+AC_CONFIG_FILES([Makefile lib/Makefile include/Makefile bin/Makefile])
+AC_CONFIG_HEADERS([src/framework/XSECConfig.hpp])
+AH_BOTTOM([#include <xsec/framework/XSECVersion.hpp>])
# Check for basic programs
-AC_PROG_CC
-AC_PROG_CXX
+AC_PROG_CC([gcc gcc3 cc])
+AC_PROG_CXX([g++ g++3 c++ CC])
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_AWK
AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true)
-# AC_PROG_CC Defines the OBJEXT
-objsuffix=".${OBJEXT}"
+if test "$GCC" = "yes" ; then
+ CFLAGS="-Wall $GCC_CFLAGS"
+ CXXFLAGS="-Wall $GCC_CXXFLAGS"
+fi
# pthreads
ACX_PTHREAD
CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
LIBS="${LIBS} ${PTHREAD_LIBS}"
-# Set up versions
-
-package_version_major=`echo ${PACKAGE_VERSION} | ${AWK} -F '.' '{print $1}'`
-package_version_medium=`echo ${PACKAGE_VERSION} | ${AWK} -F '.' '{print $2}'`
-package_version_minor=`echo ${PACKAGE_VERSION} | ${AWK} -F '.' '{print $3}'`
-
-package_lib_major=${package_version_major}${package_version_medium}
-package_lib_minor=${package_version_minor}
-package_lib_version=${package_lib_major}.${package_lib_minor}
-
-# "cache" the check for gcc -E
-
-AC_TRY_CPP()
-AC_LANG(C++)
-AC_TRY_CPP()
-
-# Need to reset CXXFLAGS if defaults have been set
-if test "$ac_test_CXXFLAGS" != set; then
- CXXFLAGS=""
-fi
-
-# Check for Intel > 8.0 (which fools configure into thinking it is GNU
-if test "x${ac_cv_cxx_compiler_gnu}" = "xyes"; then
- AC_MSG_CHECKING([for Intel compiler disguised as GNU])
- intel_check=`${CXX} -v 2>&1 | ${AWK} '{print $1}'`
- if test "x${intel_check}" = "xVersion"; then
- AC_MSG_RESULT([yes])
- ac_cv_cxx_compiler_gnu="no"
- else
- AC_MSG_RESULT([no])
- fi
-fi
-
-AC_LANG(C)
-
# Checks for required libraries
AC_CHECK_LIB(m, floor)
AC_CHECK_LIB(socket, getservent)
-# Determine the host system and Makefile fragment
-
# Check for required includes
AC_CHECK_HEADERS(unistd.h direct.h)
-# As a part of the automake process, AM_CHECK_LIBTOOL calls
-# this automatically. Adding here causes spurious warning messages
-#AC_CANONICAL_HOST
-
-# Ensure we are always compiling using library defs
-
-CFLAGS="${CFLAGS} -DXSEC_LIBRARY_BUILD"
-CXXFLAGS="${CXXFLAGS} -DXSEC_LIBRARY_BUILD"
-
-
-# Platform-specific Makefile setup
-# We have put most of the platform specific configuration here rather than
-# in the Makefile. Autoconf is designed with platform portability in mind,
-# so by putting the complexity here we should be able to create a more
-# portable makefile.
-
-case "${host}" in
- *-*-solaris*)
- platform=SOLARIS
- shlibsuffix=.so
- lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
- lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
- lib_short_name="lib${PACKAGE_TARNAME}.so"
-
- if test "x${ac_cv_cxx_compiler_gnu}" != "xyes"; then
- # Flags for warnings as errors
- cxxflags_warnerror="-xwe -errtags"
- # Flags for Optimise
- cxxflags_optimise="-xO2"
- # Flags for debug
- cxxflags_debug="-g"
- fi
-
- # Should use -D_REENTRANT - but not yet OK
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DSOLARIS"]
- SHARED_OPTIONS="-G -DSOLARIS"
- LINK_OPTIONS="-DSOLARIS"
- ;;
-
- *-*-netbsd*) platform=NETBSD
- shlibsuffix=.so
- lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
- lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
- lib_short_name="lib${PACKAGE_TARNAME}.so"
-
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DFREEBSD"]
- SHARED_OPTIONS=["-DNETBSD -shared"]
- LINK_OPTIONS=["-DNETBSD"]
-
- # NetBSD puts packages in /usr/pkg
- CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"
- LIBS="${LIBS} -L/usr/pkg/lib"
- ;;
-
- *-*-freebsd*) platform=FREEBSD
- shlibsuffix=.so
- lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
- lib_major_name="lib${PACKAGE_TARNAME}.so.${package_version_major}"
- lib_short_name="lib${PACKAGE_TARNAME}.so"
-
- # Should use -D_REENTRANT - but not yet OK
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DFREEBSD"]
- SHARED_OPTIONS="-DFREEBSD -shared -pthread -lc_r"
- LINK_OPTIONS="-DFREEBSD -pthread -lc_r"
-
- ;;
-
- *-*-linux*) platform=LINUX ;
- shlibsuffix=.so
- lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
- lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
- lib_short_name="lib${PACKAGE_TARNAME}.so"
-
- if test "x${ac_cv_cxx_compiler_gnu}" != "xyes"; then
- # Assume Intel CC
- PLATFORM_OPTIONS=["-w1 -mp -prec_div"]
- fi
-
- # Should use -D_REENTRANT - but not yet OK
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DLINUX"]
- SHARED_OPTIONS=["-Wl,-soname,\$(LIBNAME) -DLINUX -shared"]
- LINK_OPTIONS=["-DLINUX -ldl"]
-
- ;;
-
- *-*-cygwin*)
- platform=CYGWIN
- shlibsuffix=.dll
- lib_name="cyg${PACKAGE_TARNAME}-${package_lib_version}.dll"
- lib_major_name="lib${PACKAGE_TARNAME}.dll.a"
- lib_short_name="cyg${PACKAGE_TARNAME}.dll"
-
- # Assume g++
- PLATFORM_OPTIONS=["-Wall"]
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DCYGWIN"]
- PIC=""
- SHARED_OPTIONS="-Wl,-soname,\$(LIBNAME) -DCYGWIN -shared -Xlinker --warn-once -Xlinker -Map -Xlinker ../lib/lib${PACKAGE_TARNAME}.map -Xlinker --output-def -Xlinker ../lib/lib${PACKAGE_TARNAME}.def -Xlinker --out-implib -Xlinker ../lib/\$(LIBMAJORNAME)"
- LINK_OPTIONS=["-DCYGWIN"]
-
- # Define installation commands as cygwin uses different defaults
- INSTALL_COMMAND_1=["\$(INSTALL) -d \$(DESTDIR)\${bindir} && \$(INSTALL) \${THISLIB} \$(DESTDIR)\${bindir}"]
- INSTALL_COMMAND_2=["\$(INSTALL) -d \$(DESTDIR)\${libdir} && \$(INSTALL) \$(LIB_DIR)/\$(LIBMAJORNAME) \$(DESTDIR)\${libdir}"]
-
- # Define this to kill the link commands
- LINK_COMMAND_1=true
- ;;
-
-# *-*-irix*) platform=IRIX ;;
-# *-*-aix*) platform=AIX ;;
-# *-*-hp*) platform=HPUX ;
-# case "${host}" in
-# *-*-hpux11*) osver=HPUX11;;
-# *-*-hpux10*) osver=HPUX10;;
-# *) osver=HPUX11;;
-# esac;;
-# *-*-mvs*) platform=OS390 ;;
-
- *-*-osf*)
- platform=TRU64
- shlibsuffix=.so
- lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
- lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
- lib_short_name="lib${PACKAGE_TARNAME}.so"
-
- # Should use -D_REENTRANT - but not yet OK
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DTRU64"]
- SHARED_OPTIONS=["-Wl,-soname,\$(LIBNAME) -DTRU64 -shared"]
- LINK_OPTIONS=["-DTRU64"]
- ;;
-
- *-apple-darwin*)
- platform=MACOSX
- shlibsuffix=.dylib
- lib_name="lib${PACKAGE_TARNAME}.${package_lib_version}.dylib"
- lib_major_name="lib${PACKAGE_TARNAME}.${package_lib_major}.dylib"
- lib_short_name="lib${PACKAGE_TARNAME}.dylib"
-
- if test "x${ac_cv_cxx_compiler_gnu}" != "xyes"; then
- # Not sure if these will work - only tested with g++
- PLATFORM_OPTIONS=["-w1 -mp -prec_div"]
- fi
-
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DMACOSX"]
- SHARED_OPTIONS=["-Xlinker -install_name -Xlinker \$(LIBNAME) -DMACOSX -dynamiclib"]
- LINK_OPTIONS=["-DMACOSX"]
- ;;
-
- *) platform=UNKNOWN
- AC_MSG_ERROR([Unknown Platform. Aborting])
- ;;
-esac
-
-# Now we should have all compiler specific flags. So set up specific flags
-# we need
-
-# First if we are using gcc then...
-if test "x${ac_cv_cxx_compiler_gnu}" = "xyes" ; then
-
- CXXFLAGS=["${CXXFLAGS} ${PLATFORM_OPTIONS} -Wall"]
-
- if test "$enable_debug" = "yes" ; then
- CXXFLAGS="${CXXFLAGS} -g"
- else
- CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
- fi
-
- if test "x${enable_warnerror}" = "xyes" ; then
- AC_MSG_WARN([Enabling error on warnings])
- CXXFLAGS="${CXXFLAGS} -Werror -Wno-deprecated"
- fi
-else
-
- if test "$enable_debug" = "yes" ; then
- CXXFLAGS="${CXXFLAGS} ${cxxflags_debug}"
- else
- CXXFLAGS="${CXXFLAGS} ${cxxflags_optimise} -DNDEBUG"
- fi
-
- if test "x${enable_warnerror}" = "xyes" ; then
- AC_MSG_WARN([Enabling error on warnings])
- CXXFLAGS="${CXXFLAGS} ${cxxflags_warnerror}"
- fi
-
-fi
-
-# How do we run the C++ compiler?
-CC1=["${CXX} ${CXXFLAGS}"]
-# Command to make the shared library
-MAKE_SHARED=["${CXX} ${CXXFLAGS} ${SHARED_OPTIONS}"]
-# Command to link an executable
-LINK=["${CXX} ${CXXFLAGS} ${LINK_OPTIONS}"]
-
-# Default commands to create the library in the correct place
-
-if test -z "$LINK_COMMAND_1" ; then
- LINK_COMMAND_1=["(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"]
- LINK_COMMAND_2=["(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"]
-fi
-
-# Default commands to install
-
-if test -z "$INSTALL_COMMAND_1" ; then
- INSTALL_COMMAND_1=["\$(INSTALL) -d \$(DESTDIR)\${libdir} && \$(INSTALL) \${THISLIB} \$(DESTDIR)\${libdir}"]
- INSTALL_COMMAND_2=["\$(RM) \$(DESTDIR)\${libdir}/\${LIBMAJORNAME} && \$(LN_S) \${LIBNAME} \$(DESTDIR)\${libdir}/\${LIBMAJORNAME}"]
- INSTALL_COMMAND_3=["\$(RM) \$(DESTDIR)\${libdir}/\${LIBSHORTNAME} && \$(LN_S) \${LIBNAME} \$(DESTDIR)\${libdir}/\${LIBSHORTNAME}"]
-fi
-
-
-# Find Xerces
-
-# Check for Xerces using XERCESCROOT (override any system version)
-
AC_LANG(C++)
-if test $XERCESCROOT; then
-
- OLDCPPFLAGS=$CPPFLAGS
- CPPFLAGS=["${CPPFLAGS} -I${XERCESCROOT}/include"]
-
- AC_MSG_CHECKING([for Xerces 2.x or 3.x headers in XERCESCROOT/include])
- AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
- int main(int argc, char **argv) {
- if (XERCES_VERSION_MAJOR < 2)
- return 1;
- else
- return 0;
- }],
- xerces_lib_base=${XERCESCROOT}
- xerces_found=yes
- [AC_MSG_RESULT([found])],
- CPPFLAGS=$OLD_CPPFLAGS
- [AC_MSG_RESULT([no])])
-
-fi
-
-if test -z "$xerces_found" ; then
+# Xerces is required
- # Xerces was not found
+AC_ARG_WITH(xerces,AS_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]),
+ [if test x_$with_xerces != x_/usr; then
+ LDFLAGS="-L${with_xerces}/lib $LDFLAGS"
+ CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
+ fi])
+LIBS="-lxerces-c $LIBS"
+
+AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,AC_MSG_ERROR([unable to find xerces header files]))
+AC_MSG_CHECKING([Xerces version])
+AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
+[#if _XERCES_VERSION >= 20000
+int i = 0;
+#else
+#error cannot use version 1.x
+#endif])],
+ [AC_MSG_RESULT(OK)],
+ [AC_MSG_FAILURE([Xerces-C 2.x or 3.x is required])])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/PlatformUtils.hpp>]], [[xercesc::XMLPlatformUtils::Initialize()]])],
+ [],[AC_MSG_ERROR([unable to link with Xerces])])
- AC_MSG_CHECKING([for Xerces 2.x or 3.x headers in system includes])
-
- AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
- int main(int argc, char **argv) {
- if (XERCES_VERSION_MAJOR < 2)
- return 1;
- else
- return 0;
- }],
- [AC_MSG_RESULT([found])],
- [AC_MSG_ERROR([Xerces 2.0 not found. Ensure XERCESCROOT points to base directory of Xerces and Xerces 2.0 or later is available])])
+# Get user options
-fi
+AC_ARG_WITH(xalan,
+ AS_HELP_STRING([--with-xalan],[Enable Xalan integration. Values = 'yes' or installation directory (Default = yes)]),
+ use_xalan=$withval, use_xalan=yes)
-# Where is the Xerces lib?
-AC_MSG_CHECKING([for Xerces 2.x or 3.x library naming convention])
-OLD_LIBS=$LIBS
-if test -z "$xerces_lib_base" ; then
- LIBS="${LIBS} -lxerces-c"
-else
- LIBS="-L${xerces_lib_base}/lib -lxerces-c ${LIBS}"
+if test x"$use_xalan" != "xyes" ; then
+ if test x"$use_xalan" != "xno" ; then
+ XALANCROOT=$use_xalan
+ fi
fi
-AC_TRY_LINK([#include <xercesc/util/PlatformUtils.hpp>],
- [XERCES_CPP_NAMESPACE_USE XMLPlatformUtils::Initialize(); return 0; ],
- [AC_MSG_RESULT([xerces-c])]
- xerceslib_found=yes,
- [LIBS=$OLD_LIBS])
-
-if test -z "$xerceslib_found" ; then
- if test -z "$xerces_lib_base" ; then
- LIBS="${LIBS} -lxerces-3.0"
- else
- LIBS="-L${xerces_lib_base}/lib -lxerces-3.0 ${LIBS}"
- fi
+# Ensure we are always compiling using library defs
- AC_TRY_LINK([#include <xercesc/util/PlatformUtils.hpp>],
- [XERCES_CPP_NAMESPACE_USE XMLPlatformUtils::Initialize(); return 0; ],
- [AC_MSG_RESULT([xerces-3.0])]
- xerceslib_found=yes,
- [AC_MSG_RESULT([unable to determine])]
- [AC_MSG_ERROR([cannot link to Xerces library])])
-fi
+CFLAGS="${CFLAGS} -DXSEC_LIBRARY_BUILD"
+CXXFLAGS="${CXXFLAGS} -DXSEC_LIBRARY_BUILD"
# Find out some properties of the version of Xerces we have
AC_MSG_CHECKING([whether Xerces is 64-bit clean])
-
-AC_TRY_COMPILE([#include <xercesc/framework/MemBufInputSource.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/framework/MemBufInputSource.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
XMLFilePos testvar;
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_XERCES_64BITSAFE)],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XERCES_64BITSAFE],[1],[Define to 1 if Xerces has a 64-bit-safe API.])],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType])
-
-AC_TRY_COMPILE([#include <xercesc/util/BinMemInputStream.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/BinMemInputStream.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
XMLByte buf[1024];
BinMemInputStream in(buf,1024);
in.getContentType();
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE)],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE],[1],[Define to 1 if Xerces InputStream class requires getContentType.])],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces XMLFormatter requires a version])
-
-AC_TRY_COMPILE([#include <xercesc/framework/XMLFormatter.hpp>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/framework/XMLFormatter.hpp>
#include <xercesc/util/XercesDefs.hpp>
- #include <xercesc/util/XMLUniDefs.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+ #include <xercesc/util/XMLUniDefs.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
XMLCh s_encoding[] = {
chLatin_U, chLatin_T, chLatin_F, chDash, chDigit_8, chNull
};
@@ -480,71 +143,54 @@ AC_TRY_COMPILE([#include <xercesc/framew
NULL,
XMLFormatter::NoEscapes,
XMLFormatter::UnRep_CharRef);
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_XERCES_REQUIRES_MEMMGR)]
- [AC_DEFINE(XSEC_XERCES_FORMATTER_REQUIRES_VERSION)],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XERCES_REQUIRES_MEMMGR],[1],[Define to 1 if Xerces XMLFormatter requires MemoryManager.])
+ AC_DEFINE([XSEC_XERCES_FORMATTER_REQUIRES_VERSION],[1],[Define to 1 if Xerces XMLFormatter requires version.])],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces XMLString has ::release])
-
-AC_TRY_COMPILE([#include <xercesc/util/XMLString.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/XMLString.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
XMLCh * tst;
XMLString::release(&tst);
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_XERCES_XMLSTRING_HAS_RELEASE)],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XERCES_XMLSTRING_HAS_RELEASE],[1],[Define to 1 if Xerces XMLString has release method.])],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces XMLElement has ::setIdAttribute(XMLCh*)])
-
-AC_TRY_COMPILE([#include <xercesc/dom/DOM.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/dom/DOM.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
DOMElement * elt;
elt->setIdAttribute(NULL);
- ],
- [AC_MSG_RESULT([yes])]
+ ]])],[AC_MSG_RESULT([yes])
xerces_has_setidattribute=yes
- [AC_DEFINE(XSEC_XERCES_HAS_SETIDATTRIBUTE)],
+ AC_DEFINE([XSEC_XERCES_HAS_SETIDATTRIBUTE],[1],[Define to 1 if Xerces has legacy setIdAttribute.])],
[AC_MSG_RESULT([no])])
if test -z "$xerces_has_setidattribute" ; then
-
AC_MSG_CHECKING([whether Xerces XMLElement has ::setIdAttribute(XMLCh*, bool)])
- AC_TRY_COMPILE([#include <xercesc/dom/DOM.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/dom/DOM.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
DOMElement * elt;
elt->setIdAttribute(NULL, false);
- ],
- [AC_MSG_RESULT([yes])]
+ ]])],[AC_MSG_RESULT([yes])
xerces_has_setidattribute=yes
- [AC_DEFINE(XSEC_XERCES_HAS_BOOLSETIDATTRIBUTE)],
+ AC_DEFINE([XSEC_XERCES_HAS_BOOLSETIDATTRIBUTE],[1],[Define to 1 if Xerces DOM ID methods take extra parameter.])],
[AC_MSG_RESULT([no])])
-
fi
# For Xerces 3.x we now have a stricter DOM L3 implementation
AC_MSG_CHECKING([whether Xerces DOMImplementationLS has DOMLSSerializer])
-
-AC_TRY_COMPILE([#include <xercesc/dom/DOM.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/dom/DOM.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(NULL);
DOMLSSerializer *ls = ((DOMImplementationLS*)impl)->createLSSerializer();
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_XERCES_DOMLSSERIALIZER)],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XERCES_DOMLSSERIALIZER],[1],[Define to 1 if Xerces has DOMLSSerializer.])],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces DOMEntity uses getInputEncoding()])
-
-AC_TRY_COMPILE([#include <xercesc/dom/DOM.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/dom/DOM.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
DOMEntity *t;
t->getInputEncoding();
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_XERCES_DOMENTITYINPUTENCODING)],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XERCES_DOMENTITYINPUTENCODING],[1],[Define to 1 if Xerces DOMEntity has getInputEncoding.])],
[AC_MSG_RESULT([no])])
@@ -562,24 +208,22 @@ if test x"$use_xalan" != x"no" ; then
# Also now include XALANCROOT/include to cater for installed xalan
CPPFLAGS=["-I${XALANCROOT}/src -I${XALANCROOT}/include -I${XALANCROOT}/nls/include ${CPPFLAGS}"]
- AC_TRY_CPP([#include <xalanc/Include/XalanVersion.hpp>],
- xalan_found=yes
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <xalanc/Include/XalanVersion.hpp>]])],[xalan_found=yes
LIBS="-L${XALANCROOT}/lib -lxalan-c ${LIBS}"
- [AC_MSG_RESULT([found])],
- CPPFLAGS=$OLD_CPPFLAGS
- [AC_MSG_RESULT([no])]);
+ AC_MSG_RESULT([found])],[CPPFLAGS=$OLD_CPPFLAGS
+ AC_MSG_RESULT([no])]);
fi
if test -z "$xalan_found" ; then
AC_MSG_CHECKING([for Xalan in system includes])
- AC_TRY_CPP([#include <xalanc/Include/XalanVersion.hpp>],
- xalan_found=yes
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <xalanc/Include/XalanVersion.hpp>]])],[xalan_found=yes
LIBS="${LIBS} -lxalan-c"
- [AC_MSG_RESULT([found])],
- [AC_DEFINE(XSEC_NO_XALAN)]
- [AC_MSG_RESULT([no - WARNING - configuring for no Xalan])]);
+ AC_MSG_RESULT([found])],
+ [AC_DEFINE([XSEC_NO_XALAN],[1],[Define to 1 if Xalan is unavailable.])
+ AC_MSG_RESULT([no - WARNING - configuring for no Xalan])
+ ]);
fi
@@ -588,7 +232,7 @@ else
# NO_XALAN is defined - so we skip
AC_MSG_NOTICE([Warning - Xalan being configured out - XPath and XSLT will not be available])
- AC_DEFINE(XSEC_NO_XALAN)
+ AC_DEFINE([XSEC_NO_XALAN],[1],[Define to 1 if Xalan is unavailable.])
fi
@@ -597,51 +241,41 @@ if test "${xalan_found}" = "yes" ; then
AC_MSG_CHECKING([if libxalanMsg is required])
old_libs=$LIBS
LIBS="${LIBS} -lxalanMsg"
- AC_TRY_LINK([],[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
int test=1;
- ],
- AC_MSG_RESULT([yes]),
- AC_MSG_RESULT([no])
- LIBS=${old_libs});
+ ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+ LIBS=${old_libs}]);
fi
# Check for handling of XSLException types
if test "$xalan_found" = "yes" ; then
AC_MSG_CHECKING([whether XSLException::getType() returns XalanDOMString])
-
- AC_TRY_COMPILE([#include <xalanc/PlatformSupport/XSLException.hpp>],
- [ try {
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xalanc/PlatformSupport/XSLException.hpp>]], [[ try {
int x = 1;
}
catch (XALAN_CPP_NAMESPACE_QUALIFIER XSLException &e) {
e.getType().c_str();
}
- ],
- AC_DEFINE(XSEC_XSLEXCEPTION_RETURNS_DOMSTRING)
- [AC_MSG_RESULT([yes])],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XSLEXCEPTION_RETURNS_DOMSTRING],[1],[Define to 1 if Xalan XSLException returns XalanDOMString.])],
[AC_MSG_RESULT([no])]);
AC_MSG_CHECKING([whether XercesParserLiaison ctor takes XercesDOMSupport])
-
- AC_TRY_COMPILE([#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
- #include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>],
- [ XALAN_CPP_NAMESPACE_QUALIFIER XercesDOMSupport
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
+ #include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>]], [[ XALAN_CPP_NAMESPACE_QUALIFIER XercesDOMSupport
theDOMSupport;
XALAN_CPP_NAMESPACE_QUALIFIER XercesParserLiaison
theParserLiaison(theDOMSupport);
- ],
- AC_DEFINE(XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT)
- [AC_MSG_RESULT([yes])],
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT],[1],[Define to 1 if Xalan XercesParserLiaison ctor takes XercesDOMSupport.])],
[AC_MSG_RESULT([no])]);
- AC_MSG_CHECKING([whether XPathEvaluator::selectNodeList reqs NodeRefList])
-
- AC_TRY_COMPILE([#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
+ AC_MSG_CHECKING([whether XPathEvaluator::selectNodeList requires NodeRefList])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
#include <xalanc/XPath/XPathEvaluator.hpp>
#include <xalanc/XPath/NodeRefList.hpp>
- #include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>],
- [ XALAN_CPP_NAMESPACE_QUALIFIER XercesDOMSupport
+ #include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>]], [[ XALAN_CPP_NAMESPACE_QUALIFIER XercesDOMSupport
theDOMSupport;
XALAN_CPP_NAMESPACE_QUALIFIER XPathEvaluator theEvaluator;
XALAN_CPP_NAMESPACE_QUALIFIER NodeRefList theResult(
@@ -650,17 +284,14 @@ if test "$xalan_found" = "yes" ; then
NULL,
NULL,
NULL));
- ],
- [AC_MSG_RESULT([no])],
- AC_DEFINE(XSEC_SELECTNODELIST_REQS_NODEREFLIST)
- [AC_MSG_RESULT([yes])]);
+ ]])],[AC_MSG_RESULT([no])],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_SELECTNODELIST_REQS_NODEREFLIST],[1],[Define to 1 if Xalan XPathEvaluator requires NodeRefList.])]);
- AC_MSG_CHECKING([whether Xalan classes req MemoryManager])
-
- AC_TRY_COMPILE([
+ AC_MSG_CHECKING([whether Xalan classes require MemoryManager])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <xalanc/XPath/XPathDefinitions.hpp>
- #include <xalanc/XPath/Function.hpp>],
- [
+ #include <xalanc/XPath/Function.hpp>]], [[
}
XALAN_CPP_NAMESPACE_BEGIN
@@ -732,275 +363,146 @@ if test "$xalan_found" = "yes" ; then
XALAN_CPP_NAMESPACE_END
int main3(void) {
- ],
- [AC_MSG_RESULT([no])],
- AC_DEFINE(XSEC_XALAN_REQS_MEMORYMANAGER)
- [AC_MSG_RESULT([yes])]);
-
+ ]])],[AC_MSG_RESULT([no])],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_XALAN_REQS_MEMORYMANAGER],[1],[Define to 1 if Xalan requires MemoryManager])]);
fi
-# AC_LANG(C)
-
-# Check for OpenSSL
-if test $OPENSSL ; then
-
-# First check includes
-
-AC_MSG_CHECKING([for OpenSSL headers in $OPENSSL])
-
-OLD_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=["${CPPFLAGS} -I${OPENSSL}/include"]
-
-AC_TRY_CPP([#include <openssl/opensslv.h>],
- openssl_found=yes
- AC_DEFINE(HAVE_OPENSSL)
- [AC_MSG_RESULT([found])],
- [AC_MSG_ERROR(["Unable to find OpenSSL headers"])]);
-
-# Now check libs
-# Note we keep both the base OPENSSL dir and /lib to handle
-# both an installed version or a source dir
-
-OLD_LIBS=$LIBS
-LIBS=["${LIBS} -L${OPENSSL} -lcrypto"]
-
-# As of 1.3 - use AC_TRY_LINK to check as AC_CHECK_LIB does
-# the wrong thing
-
-AC_MSG_CHECKING([for libcrypto])
-AC_TRY_LINK([#include <openssl/evp.h>],
- [EVP_EncryptInit(NULL, NULL, NULL, NULL) ; return 0; ],
- [AC_MSG_RESULT([found])]
- openssllib_found=yes,
- [LIBS=$OLD_LIBS])
-
- if test -z "$openssllib_found" ; then
-
- LIBS=["${LIBS} -L${OPENSSL}/lib -lcrypto"]
- AC_TRY_LINK([#include <openssl/evp.h>],
- [EVP_EncryptInit(NULL, NULL, NULL, NULL) ; return 0; ],
- [AC_MSG_RESULT([found])]
- openssllib_found=yes,
- [LIBS=$OLD_LIBS]
- [AC_MSG_RESULT([no])]
- [AC_MSG_ERROR(["Unable to find libcrypto"])])
-
- fi
+# Crypto provider options (OpenSSL / NSS)
-fi
+AC_ARG_WITH(openssl,
+ AS_HELP_STRING([--with-openssl],[Use Openssl. Values = 'yes' or installation directory (Default = yes)]),
+ use_openssl=$withval, use_openssl=yes)
-if test -z "$openssl_found" ; then
+if test x"$use_openssl" != "xno" ; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
- if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
- if pkg-config openssl ; then
- CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags openssl`"
- LIBS="$LIBS `$PKG_CONFIG --libs openssl`"
+ # Check for explicit location or try pkg-config
+ if test x"$use_openssl" = "xyes" ; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+ if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
+ if pkg-config openssl ; then
+ SSLLIBS="`$PKG_CONFIG --libs openssl`"
+ SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
+ else
+ AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl=PATH instead])
+ fi
+ fi
+ else
+ if test x_$use_openssl != x_/usr; then
+ SSLFLAGS="-I${use_openssl}/include"
+ SSLLIBS="-L${use_openssl}/lib -lcrypto -lssl"
else
- AC_MSG_WARN([OpenSSL not supported by pkg-config, using default settings])
- LIBS="${LIBS} -lcrypto"
+ SSLLIBS="-lcrypto -lssl"
+ fi
+ fi
+
+ AC_MSG_CHECKING(for OpenSSL cflags)
+ AC_MSG_RESULT($SSLFLAGS)
+ CPPFLAGS="$CPPFLAGS $SSLFLAGS"
+
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <openssl/opensslv.h>]])],
+ [AC_DEFINE([XSEC_HAVE_OPENSSL],[1],[Define if OpenSSL is in use.])],
+ [AC_MSG_ERROR([Unable to find OpenSSL headers])]);
+
+ AC_MSG_CHECKING(for OpenSSL libraries)
+ AC_MSG_RESULT($SSLLIBS)
+ LIBS="$LIBS $SSLLIBS"
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/evp.h>]], [[EVP_EncryptInit(NULL, NULL, NULL, NULL) ; return 0; ]])],,
+ [AC_MSG_ERROR(["Unable to find libcrypto"])])
+
+ # Now try to find out some things about this version of OpenSSL
+
+ AC_MSG_CHECKING([for const input buffers in OpenSSL])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/rsa.h>]], [[ const unsigned char * buf;
+ unsigned char * outbuf;
+ RSA rsa;
+ RSA_private_decrypt(1,buf,outbuf,&rsa,RSA_PKCS1_PADDING);]])],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_OPENSSL_CONST_BUFFERS],[1],[Define to 1 if OpenSSL uses const input buffers.])],
+ [AC_MSG_RESULT([no])])
+
+ AC_MSG_CHECKING([for non-broken AES support])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/evp.h>]], [[ EVP_aes_256_cbc();
+ ]])],[AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_OPENSSL_HAVE_AES],[1],[Define to 1 if OpenSSL has full AES support.])],
+ [AC_MSG_RESULT([no])])
+
+ AC_CHECK_DECL(EVP_PKEY_set1_EC_KEY,
+ [AC_DEFINE([XSEC_OPENSSL_HAVE_EC],[1],[Define to 1 if OpenSSL has EC support.])],
+ ,[#include <openssl/evp.h>])
+
+ AC_CHECK_DECL(EVP_sha512,
+ [AC_DEFINE([XSEC_OPENSSL_HAVE_SHA2],[1],[Define to 1 if OpenSSL has SHA2 support.])],
+ ,[#include <openssl/evp.h>])
+
+ AC_CHECK_DECL(EVP_CIPHER_CTX_set_padding,
+ [AC_DEFINE([XSEC_OPENSSL_CANSET_PADDING],[1],[Define to 1 if OpenSSL has EVP_CIPHER_CTX_set_padding.])],
+ ,[#include <openssl/evp.h>])
+
+ AC_CHECK_DECL(CRYPTO_cleanup_all_ex_data,
+ [AC_DEFINE([XSEC_OPENSSL_HAVE_CRYPTO_CLEANUP_ALL_EX_DATA],[1],[Define to 1 if OpenSSL has CRYPTO_cleanup_all_ex_data.])],
+ ,[#include <openssl/crypto.h>])
+
+ AC_MSG_CHECKING([for const input buffer in loadX509Base64Bin])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/x509.h>]], [[ const unsigned char * buf; d2i_X509(NULL, &buf, 1);]])],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([XSEC_OPENSSL_D2IX509_CONST_BUFFER],[1],[Define to 1 if OpenSSL X509 API has const input buffer.])],
+ [AC_MSG_RESULT([no])])
+fi
+
+AC_ARG_WITH(nss,
+ AS_HELP_STRING([--with-nss],[Use NSS. Values = 'yes' or installation directory (Default = no)]),
+ use_nss=$withval, use_nss=no)
+
+if test x"$use_nss" != "xno" ; then
+
+ # Check for explicit location or try pkg-config
+ if test x"$use_nss" = "xyes" ; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+ if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
+ if pkg-config nss ; then
+ NSSLIBS="`$PKG_CONFIG --libs nss`"
+ NSSFLAGS="`$PKG_CONFIG --cflags nss`"
+ else
+ AC_MSG_WARN([NSS not supported by pkg-config, try --with-nss=PATH instead])
+ fi
+ else
+ check=`nss-config --version 2>/dev/null`
+ if test -n "$check"; then
+ NSSLIBS=`nss-config --libs`
+ NSSFLAGS=`nss-config --cflags`
+ else
+ AC_MSG_ERROR([Unable to use pkg-config or find nss-config, try --with-nss=PATH])
+ fi
fi
else
- LIBS="${LIBS} -lcrypto"
+ if test x_$use_nss != x_/usr; then
+ NSSFLAGS="-I${use_nss}/include"
+ NSSLIBS="-L${use_nss}/lib"
+ fi
+ NSSLIBS="$NSSLIBS -lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4"
fi
-
- AC_MSG_CHECKING([for OpenSSL in system includes])
- AC_TRY_CPP([#include <openssl/opensslv.h>],
- openssl_found=yes
- AC_DEFINE(HAVE_OPENSSL)
- [AC_MSG_RESULT([found])],
- [AC_MSG_RESULT([no])]
- [AC_MSG_ERROR([OpenSSL header files not found. Please define OPENSSL])]);
-
+
+ AC_MSG_CHECKING(for NSS cflags)
+ AC_MSG_RESULT($NSSFLAGS)
+ CPPFLAGS="$CPPFLAGS $NSSFLAGS"
+
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <nss3/nss.h>]])],
+ [AC_DEFINE([XSEC_HAVE_NSS],[1],[Define if NSS is in use.])],
+ [AC_MSG_ERROR([Unable to find NSS headers])])
+
+ AC_MSG_CHECKING(for NSS libraries)
+ AC_MSG_RESULT($NSSLIBS)
+ LIBS="$LIBS $NSSLIBS"
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nss3/nss.h>]], [[NSS_NoDB_Init(NULL);]])],,
+ [AC_MSG_ERROR([Unable to link with NSS])])
fi
-# Now try to find out some things about this version of OpenSSL
-
-AC_LANG(C++)
-
-AC_MSG_CHECKING([for const input buffers in OpenSSL])
-AC_TRY_COMPILE([#include <openssl/rsa.h>],
- [ const unsigned char * buf;
- unsigned char * outbuf;
- RSA rsa;
-
- RSA_private_decrypt(1,
- buf,
- outbuf,
- &rsa,
- RSA_PKCS1_PADDING);
-
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_OPENSSL_CONST_BUFFERS)],
- [AC_MSG_RESULT([no])])
-
-# Check for full strength AES - Solaris 10 install is broken
-# and only supports low end AES. As the library does not have
-# this granularity, we have to disable AES in this instance.
-
-# AC_CHECK_DECL(EVP_aes_256_cbc,
-# [AC_DEFINE(XSEC_OPENSSL_HAVE_AES)],
-# ,[#include <openssl/evp.h>])
-
-AC_MSG_CHECKING([for non-broken AES support])
-AC_TRY_LINK([#include <openssl/evp.h>],
- [ EVP_aes_256_cbc();
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_OPENSSL_HAVE_AES)],
- [AC_MSG_RESULT([no])])
-
-AC_CHECK_DECL(EVP_PKEY_set1_EC_KEY,
- [AC_DEFINE(XSEC_OPENSSL_HAVE_EC)],
- ,[#include <openssl/evp.h>])
-
-AC_CHECK_DECL(EVP_sha512,
- [AC_DEFINE(XSEC_OPENSSL_HAVE_SHA2)],
- ,[#include <openssl/evp.h>])
-
-AC_CHECK_DECL(EVP_CIPHER_CTX_set_padding,
- [AC_DEFINE(XSEC_OPENSSL_CANSET_PADDING)],
- ,[#include <openssl/evp.h>])
-
-AC_CHECK_DECL(CRYPTO_cleanup_all_ex_data,
- [AC_DEFINE(XSEC_OPENSSL_HAVE_CRYPTO_CLEANUP_ALL_EX_DATA)],
- ,[#include <openssl/crypto.h>])
-
-AC_MSG_CHECKING([for const input buffer in loadX509Base64Bin])
-AC_TRY_COMPILE([#include <openssl/x509.h>],
- [ const unsigned char * buf;
- d2i_X509(NULL, &buf, 1);
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE(XSEC_OPENSSL_D2IX509_CONST_BUFFER)],
- [AC_MSG_RESULT([no])])
-
-# String functions
-AC_CHECK_DECL(_strdup,
- [AC_DEFINE(XSEC_HAVE__STRDUP)],
- ,[#include <string.h>])
-
-AC_CHECK_DECL(_stricmp,
- [AC_DEFINE(XSEC_HAVE__STRDUP)],
- ,[#include <string.h>])
-
-AC_CHECK_DECL(_getcwd,
- [AC_DEFINE(XSEC_HAVE__GETCWD)],
- ,[#include <string.h>])
-
-AC_CHECK_DECL(_getcwd,
- [AC_DEFINE(XSEC_HAVE__GETCWD)],
- ,[#include <string.h>])
-
-AC_CHECK_DECL(stricmp,
- [AC_DEFINE(XSEC_HAVE_STRICMP)],
- ,[#include <string.h>])
-
-AC_CHECK_DECL(strcasecmp,
- [AC_DEFINE(XSEC_HAVE_STRCASECMP)],
- ,[#include <string.h>])
-
-# Populate Install directories
-
-AC_SUBST(prefix)
-AC_SUBST(exec_prefix)
-AC_SUBST(includedir)
-AC_SUBST(libdir)
-AC_SUBST(bindir)
-
-# Populate special platform specific make commands
-
-AC_SUBST(LINK_COMMAND_1)
-AC_SUBST(LINK_COMMAND_2)
-AC_SUBST(INSTALL_COMMAND_1)
-AC_SUBST(INSTALL_COMMAND_2)
-AC_SUBST(INSTALL_COMMAND_3)
-
-# Now populate the platform and Compiler related variables.
-
-AC_SUBST(platform)
-
-cxx=${CXX}
-AC_SUBST(cxx)
-
-cc=${CC}
-AC_SUBST(cc)
-
-AC_SUBST(prefix)
-AC_SUBST(osver)
-
-cxxflags=${CXXFLAGS}
-AC_SUBST(cxxflags)
-
-cppflags=${CPPFLAGS}
-AC_SUBST(cppflags)
-
-cflags=${CFLAGS}
-AC_SUBST(cflags)
-
-ldflags=${LDFLAGS}
-AC_SUBST(ldflags)
-
-libs=${LIBS}
-AC_SUBST(libs)
-
-transcoder=${TRANSCODER}
-AC_SUBST(transcoder)
-
-threads=${THREADS}
-AC_SUBST(threads)
-
-bitstobuild=${BITSTOBUILD}
-AC_SUBST(bitstobuild)
-
-cc1=${CC1}
-AC_SUBST(cc1)
-
-cc4=${CC4}
-AC_SUBST(cc4)
-
-ln_s=${LN_S}
-AC_SUBST(ln_s)
-
-install=${INSTALL}
-install_data=${INSTALL_DATA}
-
-AC_SUBST(install)
-AC_SUBST(install_data)
-
-make_shared=${MAKE_SHARED}
-AC_SUBST(make_shared)
-
-link=${LINK}
-AC_SUBST(link)
-
-AC_SUBST(objsuffix)
-AC_SUBST(shlibsuffix)
-
# Populate the Makefile conditionals
-AM_CONDITIONAL(XSEC_AM_HAVE_OPENSSL, test x$openssl_found = xyes)
-
-# Versioning
-package_version=${PACKAGE_VERSION}
-package_libtool_version="${package_version_major}${package_version_medium}:${package_version_minor}"
-AC_SUBST(package_version)
-AC_SUBST(package_version_major)
-AC_SUBST(package_libtool_version)
-AC_DEFINE_UNQUOTED(XSEC_VERSION, "$package_version")
-AC_DEFINE_UNQUOTED(XSEC_VERSION_MAJOR, $package_version_major)
-AC_DEFINE_UNQUOTED(XSEC_VERSION_MEDIUM, $package_version_medium)
-AC_DEFINE_UNQUOTED(XSEC_VERSION_MINOR, $package_version_minor)
-
-package_name=${PACKAGE_NAME}
-AC_SUBST(package_name)
-package_tarname=${PACKAGE_TARNAME}
-AC_SUBST(package_tarname)
-
-# Library names
-AC_SUBST(lib_name)
-AC_SUBST(lib_major_name)
-AC_SUBST(lib_short_name)
+AM_CONDITIONAL(XSEC_AM_HAVE_OPENSSL, test x"$use_openssl" != "xno")
+AM_CONDITIONAL(XSEC_AM_HAVE_NSS, test x"$use_nss" != "xno")
# output the Makefiles
-AC_OUTPUT()
+AC_OUTPUT
Modified: santuario/trunk/c/lib/Makefile.am
URL: http://svn.apache.org/viewvc/santuario/trunk/c/lib/Makefile.am?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/lib/Makefile.am (original)
+++ santuario/trunk/c/lib/Makefile.am Wed Sep 29 21:16:44 2010
@@ -60,6 +60,10 @@ if XSEC_AM_HAVE_OPENSSL
lib_sources += ${openssl_sources}
endif
+if XSEC_AM_HAVE_NSS
+ lib_sources += ${nss_sources}
+endif
+
# Sources are build up using a find command:
#
# find src/transformers/ -name '*.cpp' -exec echo {} \\ ";" | sed "s/src\// ..\/src\//g"
@@ -419,13 +423,8 @@ openssl_sources = \
../src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp \
../src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp \
../src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp
-
-EXTRA_DIST = \
- ../src/utils/winutils/XSECURIResolverGenericWin32.cpp \
- ../src/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp \
- ../src/utils/winutils/XSECBinHTTPURIInputStream.cpp \
- ../src/utils/winutils/XSECURIResolverGenericWin32.hpp \
- ../src/utils/winutils/XSECBinHTTPURIInputStream.hpp \
+
+nss_sources = \
../src/enc/NSS/NSSCryptoHash.hpp \
../src/enc/NSS/NSSCryptoX509.cpp \
../src/enc/NSS/NSSCryptoKeyDSA.hpp \
@@ -441,7 +440,14 @@ EXTRA_DIST = \
../src/enc/NSS/NSSCryptoSymmetricKey.cpp \
../src/enc/NSS/NSSCryptoProvider.hpp \
../src/enc/NSS/NSSCryptoKeyRSA.cpp \
- ../src/enc/NSS/NSSCryptoKeyHMAC.cpp \
+ ../src/enc/NSS/NSSCryptoKeyHMAC.cpp
+
+EXTRA_DIST = \
+ ../src/utils/winutils/XSECURIResolverGenericWin32.cpp \
+ ../src/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp \
+ ../src/utils/winutils/XSECBinHTTPURIInputStream.cpp \
+ ../src/utils/winutils/XSECURIResolverGenericWin32.hpp \
+ ../src/utils/winutils/XSECBinHTTPURIInputStream.hpp \
../src/enc/WinCAPI/WinCAPICryptoProvider.cpp \
../src/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp \
../src/enc/WinCAPI/WinCAPICryptoHash.cpp \
Modified: santuario/trunk/c/m4/acx_pthread.m4
URL: http://svn.apache.org/viewvc/santuario/trunk/c/m4/acx_pthread.m4?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/m4/acx_pthread.m4 (original)
+++ santuario/trunk/c/m4/acx_pthread.m4 Wed Sep 29 21:16:44 2010
@@ -86,8 +86,7 @@
AC_DEFUN([ACX_PTHREAD], [
AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG_C
+AC_LANG_PUSH([C])
acx_pthread_ok=no
# We used to check for pthread.h first, but this fails if pthread.h
@@ -200,11 +199,9 @@ for flag in $acx_pthread_flags; do
# pthread_cleanup_push because it is one of the few pthread
# functions on Solaris that doesn't have a non-functional libc stub.
# We try pthread_create on general principles.
- AC_TRY_LINK([#include <pthread.h>],
- [pthread_t th; pthread_join(th, 0);
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t th; pthread_join(th, 0);
pthread_attr_init(0); pthread_cleanup_push(0, 0);
- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
- [acx_pthread_ok=yes])
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ]])],[acx_pthread_ok=yes],[])
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
@@ -230,8 +227,7 @@ if test "x$acx_pthread_ok" = xyes; then
AC_MSG_CHECKING([for joinable pthread attribute])
attr_name=unknown
for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
- AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
- [attr_name=$attr; break])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[int attr=$attr; return attr;]])],[attr_name=$attr; break],[])
done
AC_MSG_RESULT($attr_name)
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
@@ -283,5 +279,5 @@ else
acx_pthread_ok=no
$2
fi
-AC_LANG_RESTORE
+AC_LANG_POP
])dnl ACX_PTHREAD
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoHash.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoHash.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoHash.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoHash.cpp Wed Sep 29 21:16:44 2010
@@ -26,7 +26,7 @@
#include <xsec/enc/NSS/NSSCryptoHash.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
// --------------------------------------------------------------------------------
// Constructor
@@ -165,4 +165,4 @@ XSECCryptoHash::HashType NSSCryptoHash::
}
-#endif /* HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
\ No newline at end of file
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoHash.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoHash.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoHash.hpp Wed Sep 29 21:16:44 2010
@@ -29,10 +29,10 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoHash.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
-#include "nss/pk11func.h"
-#include "nss/nss.h"
+#include <nss3/pk11func.h>
+#include <nss3/nss.h>
/**
* @ingroup nsscrypto
@@ -153,5 +153,5 @@ private:
};
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOHASHSHA1_INCLUDE */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.cpp Wed Sep 29 21:16:44 2010
@@ -28,7 +28,7 @@
#include <xsec/enc/NSS/NSSCryptoKeyHMAC.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
#include <memory.h>
@@ -265,4 +265,4 @@ XSECCryptoHash::HashType NSSCryptoHashHM
}
-#endif /* HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
\ No newline at end of file
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoHashHMAC.hpp Wed Sep 29 21:16:44 2010
@@ -29,10 +29,10 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoHash.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
-#include "nss/pk11func.h"
-#include "nss/nss.h"
+#include <nss3/pk11func.h>
+#include <nss3/nss.h>
/**
* @ingroup nsscrypto
@@ -164,5 +164,5 @@ private:
};
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOHASHHMAC_INCLUDE */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.cpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xercesc/util/Janitor.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
XSEC_USING_XERCES(ArrayJanitor);
@@ -621,4 +621,4 @@ unsigned int NSSCryptoKeyDSA::getYBase64
}
-#endif /* HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
\ No newline at end of file
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoKeyDSA.hpp Wed Sep 29 21:16:44 2010
@@ -28,11 +28,11 @@
#include <xsec/enc/XSECCryptoKeyDSA.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
-#include "nss/pk11func.h"
-#include "nss/keyhi.h"
-#include "nss/nss.h"
+#include <nss3/pk11func.h>
+#include <nss3/keyhi.h>
+#include <nss3/nss.h>
class NSSCryptoProvider;
@@ -254,5 +254,5 @@ private:
};
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOKEYDSA_INCLUDE */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.cpp Wed Sep 29 21:16:44 2010
@@ -27,7 +27,7 @@
#include <xsec/framework/XSECError.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
// --------------------------------------------------------------------------------
// Constructor
@@ -79,4 +79,4 @@ XSECCryptoKey * NSSCryptoKeyHMAC::clone(
}
-#endif /* HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
\ No newline at end of file
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoKeyHMAC.hpp Wed Sep 29 21:16:44 2010
@@ -28,10 +28,10 @@
#include <xsec/enc/XSECCryptoKeyHMAC.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
-#include "nss/pk11func.h"
-#include "nss/nss.h"
+#include <nss3/pk11func.h>
+#include <nss3/nss.h>
/**
* \ingroup nsscrypto
@@ -124,5 +124,5 @@ private:
};
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOKEYHMAC_INCLUDE */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xercesc/util/Janitor.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
#include <secder.h>
#include <secdig.h>
@@ -749,4 +749,4 @@ unsigned int NSSCryptoKeyRSA::getModulus
return bLen;
}
-#endif /* HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
\ No newline at end of file
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.hpp Wed Sep 29 21:16:44 2010
@@ -28,11 +28,11 @@
#include <xsec/enc/XSECCryptoKeyRSA.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
-#include "nss/pk11func.h"
-#include "nss/keyhi.h"
-#include "nss/nss.h"
+#include <nss3/pk11func.h>
+#include <nss3/keyhi.h>
+#include <nss3/nss.h>
class NSSCryptoProvider;
@@ -312,5 +312,5 @@ private:
};
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOKEYRSA_INCLUDE */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp Wed Sep 29 21:16:44 2010
@@ -35,10 +35,10 @@
#include <xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
-#include "nss/pk11func.h"
-#include "nss/nss.h"
+#include <nss3/pk11func.h>
+#include <nss3/nss.h>
#include <xercesc/util/Janitor.hpp>
@@ -459,4 +459,4 @@ unsigned int NSSCryptoProvider::getRando
}
-#endif /* HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.hpp Wed Sep 29 21:16:44 2010
@@ -29,10 +29,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoProvider.hpp>
-#if defined (HAVE_NSS)
-
-#include "nss/pk11func.h"
-#include "nss/nss.h"
+#if defined (XSEC_HAVE_NSS)
/**
* @defgroup nsscrypto NSS Interface
@@ -320,6 +317,6 @@ private:
/*\@}*/
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOPROVIDER_INCLUDE */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.cpp Wed Sep 29 21:16:44 2010
@@ -33,7 +33,7 @@
#include <xercesc/util/Janitor.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
#include "prerror.h"
@@ -585,4 +585,4 @@ unsigned int NSSCryptoSymmetricKey::encr
}
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoSymmetricKey.hpp Wed Sep 29 21:16:44 2010
@@ -30,10 +30,10 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoSymmetricKey.hpp>
-#if defined (HAVE_NSS)
+#if defined (XSEC_HAVE_NSS)
-#include "nss/pk11func.h"
-#include "nss/nss.h"
+#include <nss3/pk11func.h>
+#include <nss3/nss.h>
#define NSS_MAX_BLOCK_SIZE 32
@@ -290,5 +290,5 @@ private:
};
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOSYMMETRICKEY_INCLUDE */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoX509.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoX509.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoX509.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoX509.cpp Wed Sep 29 21:16:44 2010
@@ -32,9 +32,7 @@
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp>
-#if defined (HAVE_NSS)
-
-#include <nss/cert.h>
+#if defined (XSEC_HAVE_NSS)
extern "C" {
@@ -253,4 +251,4 @@ XSECCryptoKey * NSSCryptoX509::clonePubl
}
-#endif /* HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoX509.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoX509.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoX509.hpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoX509.hpp Wed Sep 29 21:16:44 2010
@@ -29,7 +29,9 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoX509.hpp>
-#if defined (HAVE_NSS)
+#include <nss3/cert.h>
+
+#if defined (XSEC_HAVE_NSS)
class NSSCryptoProvider;
@@ -141,6 +143,6 @@ private:
};
-#endif /* HAVE_NSS */
+#endif /* XSEC_HAVE_NSS */
#endif /* NSSCRYPTOX509_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.cpp Wed Sep 29 21:16:44 2010
@@ -28,7 +28,7 @@
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
@@ -200,4 +200,4 @@ BIGNUM * OpenSSLCryptoBase64::b642BN(cha
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoBase64.hpp Wed Sep 29 21:16:44 2010
@@ -32,7 +32,7 @@
#include <xsec/enc/XSECCryptoBase64.hpp>
// OpenSSL
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
# include <openssl/evp.h>
/**
@@ -205,5 +205,5 @@ private :
/*\@}*/
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOBASE64_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.cpp Wed Sep 29 21:16:44 2010
@@ -26,7 +26,7 @@
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
@@ -156,4 +156,4 @@ XSECCryptoHash::HashType OpenSSLCryptoHa
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHash.hpp Wed Sep 29 21:16:44 2010
@@ -33,7 +33,7 @@
// OpenSSL Includes
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
# include <openssl/evp.h>
@@ -153,5 +153,5 @@ private:
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOHASHSHA1_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp Wed Sep 29 21:16:44 2010
@@ -26,7 +26,7 @@
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp>
@@ -197,4 +197,4 @@ XSECCryptoHash::HashType OpenSSLCryptoHa
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp Wed Sep 29 21:16:44 2010
@@ -33,7 +33,7 @@
#include <xsec/utils/XSECSafeBuffer.hpp>
// OpenSSL Includes
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <openssl/evp.h>
#include <openssl/hmac.h>
@@ -178,5 +178,5 @@ private:
bool m_initialised;
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOHASHHMAC_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp Wed Sep 29 21:16:44 2010
@@ -25,7 +25,7 @@
*
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
@@ -350,4 +350,4 @@ XSECCryptoKey * OpenSSLCryptoKeyDSA::clo
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp Wed Sep 29 21:16:44 2010
@@ -30,7 +30,7 @@
#include <xsec/enc/XSECCryptoKeyDSA.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <openssl/evp.h>
/**
@@ -222,5 +222,5 @@ private:
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* XSECCRYPTOKEYDSA_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp Wed Sep 29 21:16:44 2010
@@ -25,7 +25,7 @@
*
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL) && defined (XSEC_OPENSSL_HAVE_EC)
+#if defined (XSEC_HAVE_OPENSSL) && defined (XSEC_OPENSSL_HAVE_EC)
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
@@ -301,4 +301,4 @@ XSECCryptoKey * OpenSSLCryptoKeyEC::clon
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp Wed Sep 29 21:16:44 2010
@@ -30,7 +30,7 @@
#include <xsec/enc/XSECCryptoKeyEC.hpp>
-#if defined (HAVE_OPENSSL) && defined(XSEC_OPENSSL_HAVE_EC)
+#if defined (XSEC_HAVE_OPENSSL) && defined(XSEC_OPENSSL_HAVE_EC)
#include <openssl/ec.h>
#include <openssl/evp.h>
@@ -182,5 +182,5 @@ private:
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* XSECCRYPTOKEYEC_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp Wed Sep 29 21:16:44 2010
@@ -26,7 +26,7 @@
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp>
#include <xsec/framework/XSECError.hpp>
@@ -66,4 +66,4 @@ XSECCryptoKey * OpenSSLCryptoKeyHMAC::cl
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp Wed Sep 29 21:16:44 2010
@@ -30,7 +30,7 @@
#include <xsec/enc/XSECCryptoKeyHMAC.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
/**
* \ingroup opensslcrypto
@@ -125,6 +125,6 @@ private:
unsigned int m_keyLen;
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOKEYHMAC_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp Wed Sep 29 21:16:44 2010
@@ -26,7 +26,7 @@
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
@@ -677,4 +677,4 @@ XSECCryptoKey * OpenSSLCryptoKeyRSA::clo
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp Wed Sep 29 21:16:44 2010
@@ -30,7 +30,7 @@
#include <xsec/enc/XSECCryptoKeyRSA.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <openssl/evp.h>
/**
@@ -285,5 +285,5 @@ private:
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOKEYRSA_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp Wed Sep 29 21:16:44 2010
@@ -26,7 +26,7 @@
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/framework/XSECError.hpp>
@@ -485,4 +485,4 @@ unsigned int OpenSSLCryptoProvider::getR
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp Wed Sep 29 21:16:44 2010
@@ -34,7 +34,7 @@
#include <map>
#include <string>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
/**
* @defgroup opensslcrypto OpenSSL Interface
@@ -317,5 +317,5 @@ public :
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOPROVIDER_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp Wed Sep 29 21:16:44 2010
@@ -35,7 +35,7 @@
#include <xercesc/util/Janitor.hpp>
XERCES_CPP_NAMESPACE_USE;
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <string.h>
@@ -764,4 +764,4 @@ unsigned int OpenSSLCryptoSymmetricKey::
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp Wed Sep 29 21:16:44 2010
@@ -34,7 +34,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoSymmetricKey.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
// OpenSSL Includes
@@ -310,5 +310,5 @@ private:
bool m_doPad; // Do we pad last block?
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOSYMMETRICKEY_INCLUDE */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp Wed Sep 29 21:16:44 2010
@@ -26,7 +26,7 @@
*/
#include <xsec/framework/XSECDefs.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECError.hpp>
@@ -269,4 +269,4 @@ XSECCryptoKey * OpenSSLCryptoX509::clone
}
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
Modified: santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.hpp (original)
+++ santuario/trunk/c/src/enc/OpenSSL/OpenSSLCryptoX509.hpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoX509.hpp>
-#if defined (HAVE_OPENSSL)
+#if defined (XSEC_HAVE_OPENSSL)
#include <openssl/x509.h>
#include <openssl/bio.h>
@@ -151,6 +151,6 @@ private:
safeBuffer m_DERX509;
};
-#endif /* HAVE_OPENSSL */
+#endif /* XSEC_HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOX509_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.cpp Wed Sep 29 21:16:44 2010
@@ -29,7 +29,7 @@
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/WinCAPI/WinCAPICryptoProvider.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#include <memory.h>
@@ -155,4 +155,4 @@ XSECCryptoHash::HashType WinCAPICryptoHa
}
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHash.hpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoHash.hpp>
-# if defined (HAVE_WINCAPI)
+# if defined (XSEC_HAVE_WINCAPI)
#if !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0400
@@ -165,5 +165,5 @@ private:
};
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOHASHSHA1_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xsec/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#include <memory.h>
@@ -413,4 +413,4 @@ XSECCryptoHash::HashType WinCAPICryptoHa
}
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoHash.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#if !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0400
@@ -187,5 +187,5 @@ private:
};
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOHASHHMAC_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.cpp Wed Sep 29 21:16:44 2010
@@ -32,7 +32,7 @@
#include <xsec/enc/XSECCryptoUtils.hpp>
#include <xsec/framework/XSECError.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#include <xercesc/util/Janitor.hpp>
@@ -766,5 +766,5 @@ unsigned int WinCAPICryptoKeyDSA::getYBa
}
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyDSA.hpp Wed Sep 29 21:16:44 2010
@@ -30,7 +30,7 @@
#include <xsec/enc/XSECCryptoKeyDSA.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#if !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0400
@@ -296,5 +296,5 @@ private:
WinCAPICryptoKeyDSA();
};
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOKEYDSA_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.cpp Wed Sep 29 21:16:44 2010
@@ -29,7 +29,7 @@
#include <xsec/framework/XSECError.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
WinCAPICryptoKeyHMAC::WinCAPICryptoKeyHMAC(HCRYPTPROV prov) :m_keyBuf("") {
@@ -114,4 +114,4 @@ HCRYPTPROV WinCAPICryptoKeyHMAC::getWinK
}
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp Wed Sep 29 21:16:44 2010
@@ -30,7 +30,7 @@
#include <xsec/enc/XSECCryptoKeyHMAC.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#if !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0400
@@ -184,5 +184,5 @@ private:
HCRYPTPROV m_p;
};
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOKEYHMAC_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.cpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/framework/XSECError.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#include <xercesc/util/Janitor.hpp>
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoKeyRSA.hpp Wed Sep 29 21:16:44 2010
@@ -30,7 +30,7 @@
#include <xsec/enc/XSECCryptoKeyRSA.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#if !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0400
@@ -360,5 +360,5 @@ private:
};
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOKEYRSA_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.cpp Wed Sep 29 21:16:44 2010
@@ -39,7 +39,7 @@
#include <xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#include <xercesc/util/Janitor.hpp>
@@ -423,5 +423,5 @@ unsigned char * WinCAPICryptoProvider::W
}
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoProvider.hpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoProvider.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#if defined (_WIN32_WINNT)
# undef _WIN32_WINNT
@@ -391,6 +391,6 @@ private:
/*\@}*/
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOPROVIDER_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp Wed Sep 29 21:16:44 2010
@@ -36,7 +36,7 @@
XERCES_CPP_NAMESPACE_USE
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
// --------------------------------------------------------------------------------
// Constructors and Destructors
@@ -717,4 +717,4 @@ HCRYPTKEY WinCAPICryptoSymmetricKey::cre
}
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp Wed Sep 29 21:16:44 2010
@@ -34,7 +34,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoSymmetricKey.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#if !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0400
@@ -331,5 +331,5 @@ private:
};
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOSYMMETRICKEY_INCLUDE */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.cpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.cpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.cpp Wed Sep 29 21:16:44 2010
@@ -34,7 +34,7 @@
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#include <xercesc/util/Janitor.hpp>
@@ -203,6 +203,6 @@ XSECCryptoKey * WinCAPICryptoX509::clone
}
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
Modified: santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.hpp?rev=1002847&r1=1002846&r2=1002847&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.hpp (original)
+++ santuario/trunk/c/src/enc/WinCAPI/WinCAPICryptoX509.hpp Wed Sep 29 21:16:44 2010
@@ -31,7 +31,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoX509.hpp>
-#if defined (HAVE_WINCAPI)
+#if defined (XSEC_HAVE_WINCAPI)
#define _WIN32_WINNT 0x0400
#include <wincrypt.h>
@@ -156,6 +156,6 @@ private:
};
-#endif /* HAVE_WINCAPI */
+#endif /* XSEC_HAVE_WINCAPI */
#endif /* WINCAPICRYPTOX509_INCLUDE */