kill XMLSEC_CRYPTO completely

lsh123 · Feb 6, 2016 · fc9406c · fc9406c
1 parent d0c300e
commit fc9406c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h
@@ -87,7 +87,15 @@ XMLSEC_EXPORT int                               xmlSecInit              (void);
 XMLSEC_EXPORT int                               xmlSecShutdown          (void);
 XMLSEC_EXPORT const xmlChar *                   xmlSecGetDefaultCrypto  (void);
 
-
+/**
+ * XMLSEC_CRYPTO:
+ *
+ * Macro. Deprecated. Defined for backward compatibility only. Do not use
+ * in your code and use xmlSecGetDefaultCrypto() function instead.
+ *
+ * Returns the default crypto engine.
+ */
+#define XMLSEC_CRYPTO                          (xmlSecGetDefaultCrypto())
 
 /***********************************************************************
  *

diff --git a/xmlsec-config.in b/xmlsec-config.in
@@ -153,20 +153,20 @@ none)
     # than one crypto engine i sused by application)
     if [ "z@XMLSEC_NO_CRYPTO_DYNAMIC_LOADING@" != "z1" ] ;
     then
-        the_crypto_flags="-DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 -DXMLSEC_CRYPTO=NULL"
+        the_crypto_flags="-DXMLSEC_CRYPTO_DYNAMIC_LOADING=1"
     fi
     ;;
 
 default) 
-    the_crypto_flags="@XMLSEC_CRYPTO_CFLAGS@ -DXMLSEC_CRYPTO=NULL"
+    the_crypto_flags="@XMLSEC_CRYPTO_CFLAGS@"
     the_crypto_libs="@XMLSEC_CRYPTO_LIBS@"
     the_xmlsec_crypto_lib="-l@XMLSEC_CRYPTO_LIB@"
     ;;
 
 openssl)
     if test "@XMLSEC_NO_OPENSSL@" = "0" ;
     then
-        the_crypto_flags="@OPENSSL_CFLAGS@ -DXMLSEC_CRYPTO=NULL"
+        the_crypto_flags="@OPENSSL_CFLAGS@"
         the_crypto_libs="@OPENSSL_LIBS@"
         the_xmlsec_crypto_lib="-l@OPENSSL_CRYPTO_LIB@"
     else
@@ -178,7 +178,7 @@ openssl)
 gnutls)
     if test "@XMLSEC_NO_GNUTLS@" = "0" ;
     then
-        the_crypto_flags="@GNUTLS_CFLAGS@ -DXMLSEC_CRYPTO=NULL"
+        the_crypto_flags="@GNUTLS_CFLAGS@"
         the_crypto_libs="@GNUTLS_LIBS@"
         the_xmlsec_crypto_lib="-l@GNUTLS_CRYPTO_LIB@"
     else
@@ -190,7 +190,7 @@ gnutls)
 gcrypt)
     if test "@XMLSEC_NO_GCRYPT@" = "0" ;
     then
-        the_crypto_flags="@GCRYPT_CFLAGS@ -DXMLSEC_CRYPTO=NULLL"
+        the_crypto_flags="@GCRYPT_CFLAGS@L"
         the_crypto_libs="@GCRYPT_LIBS@"
         the_xmlsec_crypto_lib="-l@GCRYPT_CRYPTO_LIB@"
     else
@@ -202,7 +202,7 @@ gcrypt)
 nss)
     if test "@XMLSEC_NO_NSS@" = "0";
     then
-        the_crypto_flags="@NSS_CFLAGS@ -DXMLSEC_CRYPTO=NULL"
+        the_crypto_flags="@NSS_CFLAGS@"
         the_crypto_libs="@NSS_LIBS@"
         the_xmlsec_crypto_lib="-l@NSS_CRYPTO_LIB@"
     else

diff --git a/xmlsec-gcrypt.pc.in b/xmlsec-gcrypt.pc.in
@@ -7,5 +7,5 @@ Name: xmlsec1-gcrypt
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
-Cflags: -DXMLSEC_CRYPTO=NULL @XMLSEC_GCRYPT_CFLAGS@
+Cflags: @XMLSEC_GCRYPT_CFLAGS@
 Libs: @XMLSEC_GCRYPT_LIBS@
diff --git a/xmlsec-gnutls.pc.in b/xmlsec-gnutls.pc.in
@@ -7,5 +7,5 @@ Name: xmlsec1-gnutls
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
-Cflags: -DXMLSEC_CRYPTO=NULL @XMLSEC_GNUTLS_CFLAGS@
+Cflags: @XMLSEC_GNUTLS_CFLAGS@
 Libs: @XMLSEC_GNUTLS_LIBS@
diff --git a/xmlsec-nss.pc.in b/xmlsec-nss.pc.in
@@ -7,5 +7,5 @@ Name: xmlsec1-nss
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@ @NSPR_PACKAGE@ >= @MOZILLA_MIN_VERSION@ @NSS_PACKAGE@ >= @MOZILLA_MIN_VERSION@
-Cflags: -DXMLSEC_CRYPTO=NULL -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
+Cflags: -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
 Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@
diff --git a/xmlsec-openssl.pc.in b/xmlsec-openssl.pc.in
@@ -7,5 +7,5 @@ Name: xmlsec1-openssl
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
-Cflags: -DXMLSEC_CRYPTO=NULL @XMLSEC_OPENSSL_CFLAGS@
+Cflags: @XMLSEC_OPENSSL_CFLAGS@
 Libs: @XMLSEC_OPENSSL_LIBS@
diff --git a/xmlsec.pc.in b/xmlsec.pc.in
@@ -7,5 +7,5 @@ Name: xmlsec1
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@ 
-Cflags: -DXMLSEC_CRYPTO=NULL -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@
+Cflags: -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@
 Libs: -L${libdir} @XMLSEC_CORE_LIBS@ 
diff --git a/xmlsecConf.sh.in b/xmlsecConf.sh.in
@@ -7,7 +7,7 @@ libdir="@libdir@"
 includedir="@includedir@"
 
 XMLSEC_LIBDIR="@XMLSEC_LIBDIR@"
-XMLSEC_INCLUDEDIR="@XMLSEC_CFLAGS@ -DXMLSEC_CRYPTO=NULL"
+XMLSEC_INCLUDEDIR="@XMLSEC_CFLAGS@"
 XMLSEC_LIBS="@XMLSEC_LIBS@"
 MODULE_VERSION="xmlsec-@VERSION@-@XMLSEC_DEFAULT_CRYPTO@"