git-svn-id: https://svn.shibboleth.net/cpp-xmltooling/branches/REL_1@986
de75baf8-a10c-0410-a50a-
987c0e22f00f
# define XMLTOOLING_XMLSEC_ECC 1
# define XMLTOOLING_XMLSEC_DEBUGLOGGING 1
# endif
# define XMLTOOLING_XMLSEC_ECC 1
# define XMLTOOLING_XMLSEC_DEBUGLOGGING 1
# endif
-# if (_XSEC_VERSION_FULL >= 10700)
-# define XMLTOOLING_XMLSEC_OAEP11 1
-# endif
#endif
/* Define to empty if `const' does not conform to ANSI C. */
#endif
/* Define to empty if `const' does not conform to ANSI C. */
[AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_C14N11],[1],[Define to 1 if XML-Security-C includes C14N 1.1 support.])],
[AC_MSG_RESULT([no])])
[AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_C14N11],[1],[Define to 1 if XML-Security-C includes C14N 1.1 support.])],
[AC_MSG_RESULT([no])])
- AC_MSG_CHECKING([whether XML-Security-C includes MGF-pluggable RSA-OAEP support])
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#include <xsec/dsig/DSIGConstants.hpp>]],
- [[encryptionMethod em = ENCRYPT_RSA_OAEP;]])],
- [AC_MSG_RESULT([yes])AC_DEFINE([XMLTOOLING_XMLSEC_OAEP11],[1],[Define to 1 if XML-Security-C includes MGF-pluggable RSA-OAEP support.])],
- [AC_MSG_RESULT([no])])
-
AC_MSG_CHECKING([whether XML-Security-C includes debug logging support])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <xsec/utils/XSECPlatformUtils.hpp>]],
AC_MSG_CHECKING([whether XML-Security-C includes debug logging support])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <xsec/utils/XSECPlatformUtils.hpp>]],
// With ECDSA, XML-Security exports a public macro for OpenSSL's support, and any
// versions of XML-Security that didn't provide the macro don't handle ECDSA anyway.
// With ECDSA, XML-Security exports a public macro for OpenSSL's support, and any
// versions of XML-Security that didn't provide the macro don't handle ECDSA anyway.
+ // However, the SHA-224 variant was left out of the initial XML-Security release.
// With AES and GCM, all supported XML-Security versions export a macro for OpenSSL's support.
// With AES and GCM, all supported XML-Security versions export a macro for OpenSSL's support.
#endif
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIDSA_SHA1, "DSA", 0, ALGTYPE_SIGN);
#endif
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIDSA_SHA1, "DSA", 0, ALGTYPE_SIGN);
+#if defined(URI_ID_DSA_SHA256) && defined(XMLTOOLING_OPENSSL_HAVE_SHA2) && !defined(OPENSSL_NO_SHA256)
+ registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIDSA_SHA256, "DSA", 0, ALGTYPE_SIGN);
+#endif
+
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_MD5, "RSA", 0, ALGTYPE_SIGN);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_SHA1, "RSA", 0, ALGTYPE_SIGN);
#if defined(XMLTOOLING_OPENSSL_HAVE_SHA2) && !defined(OPENSSL_NO_SHA256)
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_MD5, "RSA", 0, ALGTYPE_SIGN);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_SHA1, "RSA", 0, ALGTYPE_SIGN);
#if defined(XMLTOOLING_OPENSSL_HAVE_SHA2) && !defined(OPENSSL_NO_SHA256)
#ifdef XSEC_OPENSSL_HAVE_EC
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA1, "EC", 0, ALGTYPE_SIGN);
#ifdef XSEC_OPENSSL_HAVE_EC
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA1, "EC", 0, ALGTYPE_SIGN);
-#if defined(XMLTOOLING_OPENSSL_HAVE_SHA2) && !defined(OPENSSL_NO_SHA256)
+# if defined(XMLTOOLING_OPENSSL_HAVE_SHA2) && !defined(OPENSSL_NO_SHA256)
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA256, "EC", 0, ALGTYPE_SIGN);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA256, "EC", 0, ALGTYPE_SIGN);
+# ifdef URI_ID_ECDSA_SHA224
+ registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA224, "EC", 0, ALGTYPE_SIGN);
+# endif
-#if defined(XMLTOOLING_OPENSSL_HAVE_SHA2) && !defined(OPENSSL_NO_SHA512)
+# if defined(XMLTOOLING_OPENSSL_HAVE_SHA2) && !defined(OPENSSL_NO_SHA512)
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA384, "EC", 0, ALGTYPE_SIGN);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA512, "EC", 0, ALGTYPE_SIGN);
# endif
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA384, "EC", 0, ALGTYPE_SIGN);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIECDSA_SHA512, "EC", 0, ALGTYPE_SIGN);
# endif
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_1_5, "RSA", 0, ALGTYPE_KEYENCRYPT);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_OAEP_MGFP1, "RSA", 0, ALGTYPE_KEYENCRYPT);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_1_5, "RSA", 0, ALGTYPE_KEYENCRYPT);
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_OAEP_MGFP1, "RSA", 0, ALGTYPE_KEYENCRYPT);
-#ifdef XMLTOOLING_XMLSEC_OAEP11
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_OAEP, "RSA", 0, ALGTYPE_KEYENCRYPT);
#endif
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIRSA_OAEP, "RSA", 0, ALGTYPE_KEYENCRYPT);
#endif
/* Define to 1 if you have the `xsecsize_t' type. */
#undef HAVE_XSECSIZE_T
/* Define to 1 if you have the `xsecsize_t' type. */
#undef HAVE_XSECSIZE_T
-
-/* Define to 1 if XML-Security-C includes MGF-pluggable RSA-OAEP support. */
-#undef XMLTOOLING_XMLSEC_OAEP11
# define XMLTOOLING_XMLSEC_ECC 1
# define XMLTOOLING_XMLSEC_DEBUGLOGGING 1
# endif
# define XMLTOOLING_XMLSEC_ECC 1
# define XMLTOOLING_XMLSEC_DEBUGLOGGING 1
# endif
-# if (_XSEC_VERSION_FULL >= 10700)
-# define XMLTOOLING_XMLSEC_OAEP11 1
-# endif