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 2017/12/13 03:18:57 UTC
svn commit: r1817973 - in /santuario/xml-security-cpp/trunk/xsec: dsig/
tools/siginf/
Author: scantor
Date: Wed Dec 13 03:18:57 2017
New Revision: 1817973
URL: http://svn.apache.org/viewvc?rev=1817973&view=rev
Log:
Eliminate transform type enum.
Modified:
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransform.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.hpp
santuario/xml-security-cpp/trunk/xsec/tools/siginf/siginf.cpp
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.hpp Wed Dec 13 03:18:57 2017
@@ -41,49 +41,49 @@ XSEC_USING_XERCES(XMLString);
// Name Spaces
-#define URI_ID_DSIG "http://www.w3.org/2000/09/xmldsig#"
-#define URI_ID_DSIG11 "http://www.w3.org/2009/xmldsig11#"
-#define URI_ID_EC "http://www.w3.org/2001/10/xml-exc-c14n#"
+#define URI_ID_DSIG "http://www.w3.org/2000/09/xmldsig#"
+#define URI_ID_DSIG11 "http://www.w3.org/2009/xmldsig11#"
+#define URI_ID_EC "http://www.w3.org/2001/10/xml-exc-c14n#"
// Also used as algorithm ID for XPATH_FILTER
-#define URI_ID_XPF "http://www.w3.org/2002/06/xmldsig-filter2"
-#define URI_ID_XENC "http://www.w3.org/2001/04/xmlenc#"
-#define URI_ID_XENC11 "http://www.w3.org/2009/xmlenc11#"
+#define URI_ID_XPF "http://www.w3.org/2002/06/xmldsig-filter2"
+#define URI_ID_XENC "http://www.w3.org/2001/04/xmlenc#"
+#define URI_ID_XENC11 "http://www.w3.org/2009/xmlenc11#"
// Hashing Algorithms
-#define URI_ID_SHA1 "http://www.w3.org/2000/09/xmldsig#sha1"
-#define URI_ID_MD5 "http://www.w3.org/2001/04/xmldsig-more#md5"
+#define URI_ID_SHA1 "http://www.w3.org/2000/09/xmldsig#sha1"
+#define URI_ID_MD5 "http://www.w3.org/2001/04/xmldsig-more#md5"
#define URI_ID_SHA224 "http://www.w3.org/2001/04/xmldsig-more#sha224"
#define URI_ID_SHA256 "http://www.w3.org/2001/04/xmlenc#sha256"
#define URI_ID_SHA384 "http://www.w3.org/2001/04/xmldsig-more#sha384"
#define URI_ID_SHA512 "http://www.w3.org/2001/04/xmlenc#sha512"
// Encryption Algorithms
-#define URI_ID_3DES_CBC "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
-#define URI_ID_AES128_CBC "http://www.w3.org/2001/04/xmlenc#aes128-cbc"
-#define URI_ID_AES192_CBC "http://www.w3.org/2001/04/xmlenc#aes192-cbc"
-#define URI_ID_AES256_CBC "http://www.w3.org/2001/04/xmlenc#aes256-cbc"
-#define URI_ID_AES128_GCM "http://www.w3.org/2009/xmlenc11#aes128-gcm"
-#define URI_ID_AES192_GCM "http://www.w3.org/2009/xmlenc11#aes192-gcm"
-#define URI_ID_AES256_GCM "http://www.w3.org/2009/xmlenc11#aes256-gcm"
+#define URI_ID_3DES_CBC "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+#define URI_ID_AES128_CBC "http://www.w3.org/2001/04/xmlenc#aes128-cbc"
+#define URI_ID_AES192_CBC "http://www.w3.org/2001/04/xmlenc#aes192-cbc"
+#define URI_ID_AES256_CBC "http://www.w3.org/2001/04/xmlenc#aes256-cbc"
+#define URI_ID_AES128_GCM "http://www.w3.org/2009/xmlenc11#aes128-gcm"
+#define URI_ID_AES192_GCM "http://www.w3.org/2009/xmlenc11#aes192-gcm"
+#define URI_ID_AES256_GCM "http://www.w3.org/2009/xmlenc11#aes256-gcm"
// Key Wrap Algorithm
-#define URI_ID_KW_3DES "http://www.w3.org/2001/04/xmlenc#kw-tripledes"
-#define URI_ID_KW_AES128 "http://www.w3.org/2001/04/xmlenc#kw-aes128"
-#define URI_ID_KW_AES192 "http://www.w3.org/2001/04/xmlenc#kw-aes192"
-#define URI_ID_KW_AES256 "http://www.w3.org/2001/04/xmlenc#kw-aes256"
-#define URI_ID_KW_AES128_PAD "http://www.w3.org/2009/xmlenc11#kw-aes-128-pad"
-#define URI_ID_KW_AES192_PAD "http://www.w3.org/2009/xmlenc11#kw-aes-192-pad"
-#define URI_ID_KW_AES256_PAD "http://www.w3.org/2009/xmlenc11#kw-aes-256-pad"
+#define URI_ID_KW_3DES "http://www.w3.org/2001/04/xmlenc#kw-tripledes"
+#define URI_ID_KW_AES128 "http://www.w3.org/2001/04/xmlenc#kw-aes128"
+#define URI_ID_KW_AES192 "http://www.w3.org/2001/04/xmlenc#kw-aes192"
+#define URI_ID_KW_AES256 "http://www.w3.org/2001/04/xmlenc#kw-aes256"
+#define URI_ID_KW_AES128_PAD "http://www.w3.org/2009/xmlenc11#kw-aes-128-pad"
+#define URI_ID_KW_AES192_PAD "http://www.w3.org/2009/xmlenc11#kw-aes-192-pad"
+#define URI_ID_KW_AES256_PAD "http://www.w3.org/2009/xmlenc11#kw-aes-256-pad"
// Key Transport algorithms
-#define URI_ID_RSA_1_5 "http://www.w3.org/2001/04/xmlenc#rsa-1_5"
-#define URI_ID_RSA_OAEP_MGFP1 "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"
-#define URI_ID_RSA_OAEP "http://www.w3.org/2009/xmlenc11#rsa-oaep"
+#define URI_ID_RSA_1_5 "http://www.w3.org/2001/04/xmlenc#rsa-1_5"
+#define URI_ID_RSA_OAEP_MGFP1 "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"
+#define URI_ID_RSA_OAEP "http://www.w3.org/2009/xmlenc11#rsa-oaep"
// OAEP MGFs
-#define URI_ID_MGF1_BASE "http://www.w3.org/2009/xmlenc11#mgf1"
+#define URI_ID_MGF1_BASE "http://www.w3.org/2009/xmlenc11#mgf1"
#define URI_ID_MGF1_SHA1 "http://www.w3.org/2009/xmlenc11#mgf1sha1"
#define URI_ID_MGF1_SHA224 "http://www.w3.org/2009/xmlenc11#mgf1sha224"
#define URI_ID_MGF1_SHA256 "http://www.w3.org/2009/xmlenc11#mgf1sha256"
@@ -92,111 +92,98 @@ XSEC_USING_XERCES(XMLString);
// Transforms
-#define URI_ID_BASE64 "http://www.w3.org/2000/09/xmldsig#base64"
-#define URI_ID_XPATH "http://www.w3.org/TR/1999/REC-xpath-19991116"
-#define URI_ID_XSLT "http://www.w3.org/TR/1999/REC-xslt-19991116"
-#define URI_ID_ENVELOPE "http://www.w3.org/2000/09/xmldsig#enveloped-signature"
-#define URI_ID_C14N_NOC "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
-#define URI_ID_C14N_COM "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
+#define URI_ID_BASE64 "http://www.w3.org/2000/09/xmldsig#base64"
+#define URI_ID_XPATH "http://www.w3.org/TR/1999/REC-xpath-19991116"
+#define URI_ID_XSLT "http://www.w3.org/TR/1999/REC-xslt-19991116"
+#define URI_ID_ENVELOPE "http://www.w3.org/2000/09/xmldsig#enveloped-signature"
+#define URI_ID_C14N_NOC "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+#define URI_ID_C14N_COM "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
#define URI_ID_C14N11_NOC "http://www.w3.org/2006/12/xml-c14n11"
#define URI_ID_C14N11_COM "http://www.w3.org/2006/12/xml-c14n11#WithComments"
-#define URI_ID_EXC_C14N_NOC "http://www.w3.org/2001/10/xml-exc-c14n#"
-#define URI_ID_EXC_C14N_COM "http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
-#define XPATH_EXPR_ENVELOPE "count(ancestor-or-self::dsig:Signature | \
- here()/ancestor::dsig:Signature[1]) > \
- count(ancestor-or-self::dsig:Signature)"
+#define URI_ID_EXC_C14N_NOC "http://www.w3.org/2001/10/xml-exc-c14n#"
+#define URI_ID_EXC_C14N_COM "http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+#define XPATH_EXPR_ENVELOPE "count(ancestor-or-self::dsig:Signature | \
+ here()/ancestor::dsig:Signature[1]) > \
+ count(ancestor-or-self::dsig:Signature)"
// Signature Algorithms
-#define URI_ID_SIG_BASE "http://www.w3.org/2000/09/xmldsig#"
-#define URI_ID_SIG_BASEMORE "http://www.w3.org/2001/04/xmldsig-more#"
-#define URI_ID_SIG_BASE11 "http://www.w3.org/2009/xmldsig11#"
-#define URI_ID_SIG_DSA "dsa"
-#define URI_ID_SIG_ECDSA "ecdsa"
-#define URI_ID_SIG_HMAC "hmac"
-#define URI_ID_SIG_SHA1 "sha1"
-#define URI_ID_SIG_SHA224 "sha224"
-#define URI_ID_SIG_SHA256 "sha256"
-#define URI_ID_SIG_SHA384 "sha384"
-#define URI_ID_SIG_SHA512 "sha512"
-#define URI_ID_SIG_RSA "rsa"
-#define URI_ID_SIG_MD5 "md5"
-
-#define URI_ID_DSA_SHA1 "http://www.w3.org/2000/09/xmldsig#dsa-sha1"
-#define URI_ID_DSA_SHA256 "http://www.w3.org/2009/xmldsig11#dsa-sha256"
-#define URI_ID_HMAC_SHA1 "http://www.w3.org/2000/09/xmldsig#hmac-sha1"
-#define URI_ID_HMAC_SHA224 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha224"
-#define URI_ID_HMAC_SHA256 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
-#define URI_ID_HMAC_SHA384 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
-#define URI_ID_HMAC_SHA512 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
-#define URI_ID_RSA_SHA1 "http://www.w3.org/2000/09/xmldsig#rsa-sha1"
-#define URI_ID_RSA_SHA224 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"
-#define URI_ID_RSA_SHA256 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
-#define URI_ID_RSA_SHA384 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
-#define URI_ID_RSA_SHA512 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
-#define URI_ID_RSA_MD5 "http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
-#define URI_ID_ECDSA_SHA1 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"
-#define URI_ID_ECDSA_SHA224 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"
-#define URI_ID_ECDSA_SHA256 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"
-#define URI_ID_ECDSA_SHA384 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"
-#define URI_ID_ECDSA_SHA512 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"
+#define URI_ID_SIG_BASE "http://www.w3.org/2000/09/xmldsig#"
+#define URI_ID_SIG_BASEMORE "http://www.w3.org/2001/04/xmldsig-more#"
+#define URI_ID_SIG_BASE11 "http://www.w3.org/2009/xmldsig11#"
+#define URI_ID_SIG_DSA "dsa"
+#define URI_ID_SIG_ECDSA "ecdsa"
+#define URI_ID_SIG_HMAC "hmac"
+#define URI_ID_SIG_SHA1 "sha1"
+#define URI_ID_SIG_SHA224 "sha224"
+#define URI_ID_SIG_SHA256 "sha256"
+#define URI_ID_SIG_SHA384 "sha384"
+#define URI_ID_SIG_SHA512 "sha512"
+#define URI_ID_SIG_RSA "rsa"
+#define URI_ID_SIG_MD5 "md5"
+
+#define URI_ID_DSA_SHA1 "http://www.w3.org/2000/09/xmldsig#dsa-sha1"
+#define URI_ID_DSA_SHA256 "http://www.w3.org/2009/xmldsig11#dsa-sha256"
+#define URI_ID_HMAC_SHA1 "http://www.w3.org/2000/09/xmldsig#hmac-sha1"
+#define URI_ID_HMAC_SHA224 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha224"
+#define URI_ID_HMAC_SHA256 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
+#define URI_ID_HMAC_SHA384 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
+#define URI_ID_HMAC_SHA512 "http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
+#define URI_ID_RSA_SHA1 "http://www.w3.org/2000/09/xmldsig#rsa-sha1"
+#define URI_ID_RSA_SHA224 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"
+#define URI_ID_RSA_SHA256 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
+#define URI_ID_RSA_SHA384 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
+#define URI_ID_RSA_SHA512 "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
+#define URI_ID_RSA_MD5 "http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
+#define URI_ID_ECDSA_SHA1 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"
+#define URI_ID_ECDSA_SHA224 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"
+#define URI_ID_ECDSA_SHA256 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"
+#define URI_ID_ECDSA_SHA384 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"
+#define URI_ID_ECDSA_SHA512 "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"
// Encryption defines
-#define URI_ID_XENC_ELEMENT "http://www.w3.org/2001/04/xmlenc#Element"
-#define URI_ID_XENC_CONTENT "http://www.w3.org/2001/04/xmlenc#Content"
+#define URI_ID_XENC_ELEMENT "http://www.w3.org/2001/04/xmlenc#Element"
+#define URI_ID_XENC_CONTENT "http://www.w3.org/2001/04/xmlenc#Content"
// General
-#define URI_ID_XMLNS "http://www.w3.org/2000/xmlns/"
+#define URI_ID_XMLNS "http://www.w3.org/2000/xmlns/"
#define URI_ID_MANIFEST "http://www.w3.org/2000/09/xmldsig#Manifest"
#define URI_ID_RAWX509 "http://www.w3.org/2000/09/xmldsig#rawX509Certificate"
// Internal Crypto Providers
-#define PROV_OPENSSL "OpenSSL Provider"
-#define PROV_WINCAPI "WinCAPI Provider"
-#define PROV_NSS "NSS Provider"
+#define PROV_OPENSSL "OpenSSL Provider"
+#define PROV_WINCAPI "WinCAPI Provider"
+#define PROV_NSS "NSS Provider"
// Enumerated Types
enum canonicalizationMethod {
- CANON_NONE = 0, // No method defined
- CANON_C14N_NOC = 1, // C14n without comments
- CANON_C14N_COM = 2, // C14n with comments
- CANON_C14NE_NOC = 3, // C14n Exclusive (without comments)
- CANON_C14NE_COM = 4, // C14n Exlusive (with Comments
- CANON_C14N11_NOC = 5, // C14n 1.1 without comments
- CANON_C14N11_COM = 6 // C14n 1.1 with comments
+ CANON_NONE = 0, // No method defined
+ CANON_C14N_NOC = 1, // C14n without comments
+ CANON_C14N_COM = 2, // C14n with comments
+ CANON_C14NE_NOC = 3, // C14n Exclusive (without comments)
+ CANON_C14NE_COM = 4, // C14n Exlusive (with Comments
+ CANON_C14N11_NOC = 5, // C14n 1.1 without comments
+ CANON_C14N11_COM = 6 // C14n 1.1 with comments
};
enum signatureMethod {
- SIGNATURE_NONE = 0, // No method defined
- SIGNATURE_DSA = 1, // DSA
- SIGNATURE_HMAC = 2, // Hash MAC
- SIGNATURE_RSA = 3, // RSA
- SIGNATURE_ECDSA = 4 // ECDSA
-};
-
-
-enum transformType {
-
- TRANSFORM_BASE64,
- TRANSFORM_C14N,
- TRANSFORM_C14N11,
- TRANSFORM_EXC_C14N,
- TRANSFORM_ENVELOPED_SIGNATURE,
- TRANSFORM_XPATH,
- TRANSFORM_XSLT,
- TRANSFORM_XPATH_FILTER
+ SIGNATURE_NONE = 0, // No method defined
+ SIGNATURE_DSA = 1, // DSA
+ SIGNATURE_HMAC = 2, // Hash MAC
+ SIGNATURE_RSA = 3, // RSA
+ SIGNATURE_ECDSA = 4 // ECDSA
};
enum xpathFilterType {
- FILTER_UNION = 0, /** Results should be added to previous nodeset */
- FILTER_INTERSECT = 1, /** Results should be included if in prev nodeset */
- FILTER_SUBTRACT = 2 /** Results should be subtracted from prev nodeset */
+ FILTER_UNION = 0, /** Results should be added to previous nodeset */
+ FILTER_INTERSECT = 1, /** Results should be included if in prev nodeset */
+ FILTER_SUBTRACT = 2 /** Results should be subtracted from prev nodeset */
};
@@ -207,27 +194,27 @@ enum xpathFilterType {
inline
bool canonicalizationMethod2URI(safeBuffer& uri, canonicalizationMethod cm) {
- switch (cm) {
+ switch (cm) {
- case (CANON_C14N_NOC) :
+ case (CANON_C14N_NOC) :
- uri = URI_ID_C14N_NOC;
- break;
+ uri = URI_ID_C14N_NOC;
+ break;
- case (CANON_C14N_COM) :
+ case (CANON_C14N_COM) :
- uri = URI_ID_C14N_COM;
- break;
+ uri = URI_ID_C14N_COM;
+ break;
- case (CANON_C14NE_NOC) :
+ case (CANON_C14NE_NOC) :
- uri = URI_ID_EXC_C14N_NOC;
- break;
+ uri = URI_ID_EXC_C14N_NOC;
+ break;
- case (CANON_C14NE_COM) :
+ case (CANON_C14NE_COM) :
- uri = URI_ID_EXC_C14N_COM;
- break;
+ uri = URI_ID_EXC_C14N_COM;
+ break;
case (CANON_C14N11_NOC) :
@@ -239,12 +226,12 @@ bool canonicalizationMethod2URI(safeBuff
uri = URI_ID_C14N11_COM;
break;
- default :
- return false; // Unknown type
+ default :
+ return false; // Unknown type
- }
+ }
- return true;
+ return true;
}
@@ -256,110 +243,110 @@ class XSEC_EXPORT DSIGConstants {
public:
- // General strings
+ // General strings
- static const XMLCh * s_unicodeStrEmpty; // ""
- static const XMLCh * s_unicodeStrNL; // "\n"
- static const XMLCh * s_unicodeStrXmlns; // "xmlns"
- static const XMLCh * s_unicodeStrURI; // "URI"
+ static const XMLCh * s_unicodeStrEmpty; // ""
+ static const XMLCh * s_unicodeStrNL; // "\n"
+ static const XMLCh * s_unicodeStrXmlns; // "xmlns"
+ static const XMLCh * s_unicodeStrURI; // "URI"
- // DSIG Element Strings
- static const XMLCh * s_unicodeStrAlgorithm;
+ // DSIG Element Strings
+ static const XMLCh * s_unicodeStrAlgorithm;
- // URI_IDs
- static const XMLCh * s_unicodeStrURIDSIG;
+ // URI_IDs
+ static const XMLCh * s_unicodeStrURIDSIG;
static const XMLCh * s_unicodeStrURIDSIG11;
- static const XMLCh * s_unicodeStrURIEC;
- static const XMLCh * s_unicodeStrURIXPF;
- static const XMLCh * s_unicodeStrURIXENC;
+ static const XMLCh * s_unicodeStrURIEC;
+ static const XMLCh * s_unicodeStrURIXPF;
+ static const XMLCh * s_unicodeStrURIXENC;
static const XMLCh * s_unicodeStrURIXENC11;
- static const XMLCh * s_unicodeStrURISIGBASE;
- static const XMLCh * s_unicodeStrURISIGBASEMORE;
+ static const XMLCh * s_unicodeStrURISIGBASE;
+ static const XMLCh * s_unicodeStrURISIGBASEMORE;
static const XMLCh * s_unicodeStrURISIGBASE11;
- static const XMLCh * s_unicodeStrURIRawX509;
- static const XMLCh * s_unicodeStrURISHA1;
- static const XMLCh * s_unicodeStrURISHA224;
- static const XMLCh * s_unicodeStrURISHA256;
- static const XMLCh * s_unicodeStrURISHA384;
- static const XMLCh * s_unicodeStrURISHA512;
- static const XMLCh * s_unicodeStrURIMD5; // Not recommended
- static const XMLCh * s_unicodeStrURIBASE64;
- static const XMLCh * s_unicodeStrURIXPATH;
- static const XMLCh * s_unicodeStrURIXSLT;
- static const XMLCh * s_unicodeStrURIENVELOPE;
- static const XMLCh * s_unicodeStrURIC14N_NOC;
- static const XMLCh * s_unicodeStrURIC14N_COM;
+ static const XMLCh * s_unicodeStrURIRawX509;
+ static const XMLCh * s_unicodeStrURISHA1;
+ static const XMLCh * s_unicodeStrURISHA224;
+ static const XMLCh * s_unicodeStrURISHA256;
+ static const XMLCh * s_unicodeStrURISHA384;
+ static const XMLCh * s_unicodeStrURISHA512;
+ static const XMLCh * s_unicodeStrURIMD5; // Not recommended
+ static const XMLCh * s_unicodeStrURIBASE64;
+ static const XMLCh * s_unicodeStrURIXPATH;
+ static const XMLCh * s_unicodeStrURIXSLT;
+ static const XMLCh * s_unicodeStrURIENVELOPE;
+ static const XMLCh * s_unicodeStrURIC14N_NOC;
+ static const XMLCh * s_unicodeStrURIC14N_COM;
static const XMLCh * s_unicodeStrURIC14N11_NOC;
static const XMLCh * s_unicodeStrURIC14N11_COM;
- static const XMLCh * s_unicodeStrURIEXC_C14N_NOC;
- static const XMLCh * s_unicodeStrURIEXC_C14N_COM;
+ static const XMLCh * s_unicodeStrURIEXC_C14N_NOC;
+ static const XMLCh * s_unicodeStrURIEXC_C14N_COM;
- static const XMLCh * s_unicodeStrURIDSA_SHA1;
+ static const XMLCh * s_unicodeStrURIDSA_SHA1;
static const XMLCh * s_unicodeStrURIDSA_SHA256;
- static const XMLCh * s_unicodeStrURIRSA_MD5;
- static const XMLCh * s_unicodeStrURIRSA_SHA1;
- static const XMLCh * s_unicodeStrURIRSA_SHA224;
- static const XMLCh * s_unicodeStrURIRSA_SHA256;
- static const XMLCh * s_unicodeStrURIRSA_SHA384;
- static const XMLCh * s_unicodeStrURIRSA_SHA512;
+ static const XMLCh * s_unicodeStrURIRSA_MD5;
+ static const XMLCh * s_unicodeStrURIRSA_SHA1;
+ static const XMLCh * s_unicodeStrURIRSA_SHA224;
+ static const XMLCh * s_unicodeStrURIRSA_SHA256;
+ static const XMLCh * s_unicodeStrURIRSA_SHA384;
+ static const XMLCh * s_unicodeStrURIRSA_SHA512;
- static const XMLCh * s_unicodeStrURIECDSA_SHA1;
+ static const XMLCh * s_unicodeStrURIECDSA_SHA1;
static const XMLCh * s_unicodeStrURIECDSA_SHA224;
- static const XMLCh * s_unicodeStrURIECDSA_SHA256;
- static const XMLCh * s_unicodeStrURIECDSA_SHA384;
- static const XMLCh * s_unicodeStrURIECDSA_SHA512;
-
- static const XMLCh * s_unicodeStrURIHMAC_SHA1;
- static const XMLCh * s_unicodeStrURIHMAC_SHA224;
- static const XMLCh * s_unicodeStrURIHMAC_SHA256;
- static const XMLCh * s_unicodeStrURIHMAC_SHA384;
- static const XMLCh * s_unicodeStrURIHMAC_SHA512;
-
- static const XMLCh * s_unicodeStrURIXMLNS;
- static const XMLCh * s_unicodeStrURIMANIFEST;
-
- // URIs for Encryption
- static const XMLCh * s_unicodeStrURI3DES_CBC;
- static const XMLCh * s_unicodeStrURIAES128_CBC;
- static const XMLCh * s_unicodeStrURIAES192_CBC;
- static const XMLCh * s_unicodeStrURIAES256_CBC;
- static const XMLCh * s_unicodeStrURIAES128_GCM;
+ static const XMLCh * s_unicodeStrURIECDSA_SHA256;
+ static const XMLCh * s_unicodeStrURIECDSA_SHA384;
+ static const XMLCh * s_unicodeStrURIECDSA_SHA512;
+
+ static const XMLCh * s_unicodeStrURIHMAC_SHA1;
+ static const XMLCh * s_unicodeStrURIHMAC_SHA224;
+ static const XMLCh * s_unicodeStrURIHMAC_SHA256;
+ static const XMLCh * s_unicodeStrURIHMAC_SHA384;
+ static const XMLCh * s_unicodeStrURIHMAC_SHA512;
+
+ static const XMLCh * s_unicodeStrURIXMLNS;
+ static const XMLCh * s_unicodeStrURIMANIFEST;
+
+ // URIs for Encryption
+ static const XMLCh * s_unicodeStrURI3DES_CBC;
+ static const XMLCh * s_unicodeStrURIAES128_CBC;
+ static const XMLCh * s_unicodeStrURIAES192_CBC;
+ static const XMLCh * s_unicodeStrURIAES256_CBC;
+ static const XMLCh * s_unicodeStrURIAES128_GCM;
static const XMLCh * s_unicodeStrURIAES192_GCM;
- static const XMLCh * s_unicodeStrURIAES256_GCM;
- static const XMLCh * s_unicodeStrURIKW_3DES;
- static const XMLCh * s_unicodeStrURIKW_AES128;
- static const XMLCh * s_unicodeStrURIKW_AES192;
- static const XMLCh * s_unicodeStrURIKW_AES256;
- static const XMLCh * s_unicodeStrURIKW_AES128_PAD;
- static const XMLCh * s_unicodeStrURIKW_AES192_PAD;
- static const XMLCh * s_unicodeStrURIKW_AES256_PAD;
- static const XMLCh * s_unicodeStrURIRSA_1_5;
- static const XMLCh * s_unicodeStrURIRSA_OAEP_MGFP1;
+ static const XMLCh * s_unicodeStrURIAES256_GCM;
+ static const XMLCh * s_unicodeStrURIKW_3DES;
+ static const XMLCh * s_unicodeStrURIKW_AES128;
+ static const XMLCh * s_unicodeStrURIKW_AES192;
+ static const XMLCh * s_unicodeStrURIKW_AES256;
+ static const XMLCh * s_unicodeStrURIKW_AES128_PAD;
+ static const XMLCh * s_unicodeStrURIKW_AES192_PAD;
+ static const XMLCh * s_unicodeStrURIKW_AES256_PAD;
+ static const XMLCh * s_unicodeStrURIRSA_1_5;
+ static const XMLCh * s_unicodeStrURIRSA_OAEP_MGFP1;
static const XMLCh * s_unicodeStrURIRSA_OAEP;
static const XMLCh * s_unicodeStrURIMGF1_BASE;
- static const XMLCh * s_unicodeStrURIMGF1_SHA1;
- static const XMLCh * s_unicodeStrURIMGF1_SHA224;
- static const XMLCh * s_unicodeStrURIMGF1_SHA256;
- static const XMLCh * s_unicodeStrURIMGF1_SHA384;
- static const XMLCh * s_unicodeStrURIMGF1_SHA512;
+ static const XMLCh * s_unicodeStrURIMGF1_SHA1;
+ static const XMLCh * s_unicodeStrURIMGF1_SHA224;
+ static const XMLCh * s_unicodeStrURIMGF1_SHA256;
+ static const XMLCh * s_unicodeStrURIMGF1_SHA384;
+ static const XMLCh * s_unicodeStrURIMGF1_SHA512;
- static const XMLCh * s_unicodeStrURIXENC_ELEMENT;
- static const XMLCh * s_unicodeStrURIXENC_CONTENT;
+ static const XMLCh * s_unicodeStrURIXENC_ELEMENT;
+ static const XMLCh * s_unicodeStrURIXENC_CONTENT;
- // Internal Crypto Providers
- static const XMLCh * s_unicodeStrPROVOpenSSL;
- static const XMLCh * s_unicodeStrPROVWinCAPI;
+ // Internal Crypto Providers
+ static const XMLCh * s_unicodeStrPROVOpenSSL;
+ static const XMLCh * s_unicodeStrPROVWinCAPI;
static const XMLCh * s_unicodeStrPROVNSS;
- DSIGConstants();
+ DSIGConstants();
- static void create();
- static void destroy();
+ static void create();
+ static void destroy();
};
@@ -369,35 +356,35 @@ public:
inline
const XMLCh* canonicalizationMethod2UNICODEURI(canonicalizationMethod cm) {
- switch (cm) {
+ switch (cm) {
- case (CANON_C14N_NOC) :
+ case (CANON_C14N_NOC) :
- return DSIGConstants::s_unicodeStrURIC14N_NOC;
+ return DSIGConstants::s_unicodeStrURIC14N_NOC;
- case (CANON_C14N_COM) :
+ case (CANON_C14N_COM) :
- return DSIGConstants::s_unicodeStrURIC14N_COM;
+ return DSIGConstants::s_unicodeStrURIC14N_COM;
- case (CANON_C14NE_NOC) :
+ case (CANON_C14NE_NOC) :
- return DSIGConstants::s_unicodeStrURIEXC_C14N_NOC;
+ return DSIGConstants::s_unicodeStrURIEXC_C14N_NOC;
- case (CANON_C14NE_COM) :
+ case (CANON_C14NE_COM) :
- return DSIGConstants::s_unicodeStrURIEXC_C14N_COM;
+ return DSIGConstants::s_unicodeStrURIEXC_C14N_COM;
- default :
- break;
+ default :
+ break;
- }
+ }
- return DSIGConstants::s_unicodeStrEmpty;
+ return DSIGConstants::s_unicodeStrEmpty;
}
// --------------------------------------------------------------------------------
-// URI Inverse Mappings
+// URI Inverse Mappings
// --------------------------------------------------------------------------------
/* Map URIs to internal enums, if the URIs are known to the library.
@@ -408,9 +395,9 @@ const XMLCh* canonicalizationMethod2UNIC
*/
bool XSEC_EXPORT XSECmapURIToSignatureMethods(const XMLCh* URI,
- signatureMethod& sm,
- XSECCryptoHash::HashType& type);
+ signatureMethod& sm,
+ XSECCryptoHash::HashType& type);
bool XSEC_EXPORT XSECmapURIToCanonicalizationMethod(const XMLCh* URI,
- canonicalizationMethod& cm);
+ canonicalizationMethod& cm);
#endif /* DSIGCONSTANTS_HEADER */
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransform.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransform.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransform.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransform.hpp Wed Dec 13 03:18:57 2017
@@ -120,15 +120,6 @@ public:
//@{
/**
- * \brief Determine the transform type.
- *
- * Used to determine what the type of the transform is.
- *
- */
-
- virtual transformType getTransformType() const = 0;
-
- /**
* \brief Create the transformer element and append to an existing Chain.
*
* Implemented by each Transform class and used by the DSIGSignature
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp Wed Dec 13 03:18:57 2017
@@ -60,13 +60,6 @@ DSIGTransformBase64::~DSIGTransformBase6
// --------------------------------------------------------------------------------
-transformType DSIGTransformBase64::getTransformType() const {
-
- return TRANSFORM_BASE64;
-
-}
-
-
void DSIGTransformBase64::appendTransformer(TXFMChain * input) {
// If the input is a Nodeset then we need to find the text from the input
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.hpp Wed Dec 13 03:18:57 2017
@@ -99,15 +99,6 @@ public:
//@{
/**
- * \brief Determine the transform type.
- *
- * Used to determine what the type of the transform is.
- *
- */
-
- virtual transformType getTransformType() const;
-
- /**
* \brief Create the Base 64transformer element.
*
* Implemented by each Transform class and used by the DSIGSignature
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp Wed Dec 13 03:18:57 2017
@@ -66,16 +66,6 @@ DSIGTransformC14n::~DSIGTransformC14n()
// Interface Methods
// --------------------------------------------------------------------------------
-transformType DSIGTransformC14n::getTransformType() const {
-
- if ((m_cMethod == CANON_C14NE_NOC) || (m_cMethod == CANON_C14NE_COM))
- return TRANSFORM_EXC_C14N;
- else if ((m_cMethod == CANON_C14N11_NOC) || (m_cMethod == CANON_C14N11_COM))
- return TRANSFORM_C14N11;
- return TRANSFORM_C14N;
-
-}
-
void DSIGTransformC14n::appendTransformer(TXFMChain * input) {
TXFMC14n * c;
@@ -265,13 +255,13 @@ void DSIGTransformC14n::setCanonicalizat
}
-canonicalizationMethod DSIGTransformC14n::getCanonicalizationMethod(void) {
+canonicalizationMethod DSIGTransformC14n::getCanonicalizationMethod() const {
return m_cMethod;
}
-void DSIGTransformC14n::createInclusiveNamespaceNode(void) {
+void DSIGTransformC14n::createInclusiveNamespaceNode() {
// Creates an empty inclusiveNamespace node. Does _not_ set the prefixlist attribute
@@ -371,13 +361,13 @@ void DSIGTransformC14n::addInclusiveName
}
-const XMLCh * DSIGTransformC14n::getPrefixList(void) {
+const XMLCh * DSIGTransformC14n::getPrefixList() const {
return mp_inclNSStr;
}
-void DSIGTransformC14n::clearInclusiveNamespaces(void) {
+void DSIGTransformC14n::clearInclusiveNamespaces() {
if (mp_inclNSNode != 0) {
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.hpp Wed Dec 13 03:18:57 2017
@@ -94,15 +94,6 @@ public:
//@{
/**
- * \brief Determine the transform type.
- *
- * Used to determine what the type of the transform is.
- *
- */
-
- virtual transformType getTransformType() const;
-
- /**
* \brief Create the Canonicalising transformer element.
*
* Implemented by each Transform class and used by the DSIGSignature
@@ -139,16 +130,16 @@ public:
//@{
/**
- * \brief Change canonicalisation method.
+ * \brief Change canonicalization method.
*
- * Set the canonicalisation method to the type indicated. If this changes
+ * Set the canonicalization method to the type indicated. If this changes
* the transform from Exclusive to Standard C14n, any associated
* InclusiveNamespaces children will be removed.
*
* If this is moving from one form of Exclusive to another, any InclusiveNamespace
* children will remain.
*
- * @param method Type of canicaliser required.
+ * @param method Type of canonicalizer required.
*
* @see canonicalizationMethod
*/
@@ -156,20 +147,20 @@ public:
void setCanonicalizationMethod(canonicalizationMethod method);
/**
- * \brief Get canonicalisation type.
+ * \brief Get canonicalization type.
*
- * Return the type of canonicalisation to the caller.
+ * Return the type of canonicalization to the caller.
*
- * @returns Canonicalisation type.
+ * @returns Canonicalization type.
* @see canonicalizationMethod
*/
- canonicalizationMethod getCanonicalizationMethod(void);
+ canonicalizationMethod getCanonicalizationMethod() const;
/**
* \brief Add a namespace prefix to the InclusiveNamespaces list
*
- * Exclusive canonicalisation includes the ability to define a PrefixList of
+ * Exclusive canonicalization includes the ability to define a PrefixList of
* namespace prefixes that will not be treated exclusively, rather they will
* be handled as per normal C14n.
*
@@ -202,7 +193,7 @@ public:
* @note The pointer returned is owned by the Transform structure - do not delete.
*/
- const XMLCh * getPrefixList(void);
+ const XMLCh * getPrefixList() const;
/**
* \brief Delete all inclusive namespaces.
@@ -211,7 +202,7 @@ public:
* namespaces list.
*/
- void clearInclusiveNamespaces(void);
+ void clearInclusiveNamespaces();
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp Wed Dec 13 03:18:57 2017
@@ -60,13 +60,6 @@ DSIGTransformEnvelope::~DSIGTransformEnv
// --------------------------------------------------------------------------------
-transformType DSIGTransformEnvelope::getTransformType() const {
-
- return TRANSFORM_ENVELOPED_SIGNATURE;
-
-}
-
-
void DSIGTransformEnvelope::appendTransformer(TXFMChain * input) {
#ifdef XSEC_USE_XPATH_ENVELOPE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.hpp Wed Dec 13 03:18:57 2017
@@ -94,15 +94,6 @@ public:
//@{
/**
- * \brief Determine the transform type.
- *
- * Used to determine what the type of the transform is.
- *
- */
-
- virtual transformType getTransformType() const;
-
- /**
* \brief Create the Enevelope transformer element.
*
* Implemented by each Transform class and used by the DSIGSignature
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp Wed Dec 13 03:18:57 2017
@@ -69,12 +69,6 @@ DSIGTransformXPath::~DSIGTransformXPath(
// --------------------------------------------------------------------------------
// Interface Methods
// --------------------------------------------------------------------------------
-
-transformType DSIGTransformXPath::getTransformType() const {
-
- return TRANSFORM_XPATH;
-
-}
void DSIGTransformXPath::appendTransformer(TXFMChain * input) {
@@ -176,7 +170,7 @@ void DSIGTransformXPath::load(void) {
// XPath Transform Specific Methods
// --------------------------------------------------------------------------------
-void DSIGTransformXPath::setExpression(const char * expr) {
+void DSIGTransformXPath::setExpression(const char* expr) {
mp_exprTextNode->setNodeValue(MAKE_UNICODE_STRING(expr));
@@ -186,7 +180,7 @@ void DSIGTransformXPath::setExpression(c
-const char * DSIGTransformXPath::getExpression(void) {
+const char* DSIGTransformXPath::getExpression() const {
return m_expr.rawCharBuffer();
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.hpp Wed Dec 13 03:18:57 2017
@@ -101,15 +101,6 @@ public:
//@{
/**
- * \brief Determine the transform type.
- *
- * Used to determine what the type of the transform is.
- *
- */
-
- virtual transformType getTransformType() const;
-
- /**
* \brief Create the XPath Transformer class.
*
* Create the transformer associated with this XPath transform.
@@ -169,7 +160,7 @@ public:
* @returns The expression
*/
- const char * getExpression(void);
+ const char * getExpression() const;
/**
* \brief Add a new namespace to the list to be used
@@ -191,7 +182,7 @@ public:
* @returns A pointer to the NamedNodeMap
*/
- XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap * getNamespaces(void) {
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap * getNamespaces() const {
return mp_NSMap;
}
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp Wed Dec 13 03:18:57 2017
@@ -72,12 +72,6 @@ DSIGTransformXPathFilter::~DSIGTransform
}
-transformType DSIGTransformXPathFilter::getTransformType() const {
-
- return TRANSFORM_XPATH_FILTER;
-
-}
-
void DSIGTransformXPathFilter::appendTransformer(TXFMChain * input) {
@@ -201,14 +195,14 @@ void DSIGTransformXPathFilter::load(void
// Retrieve expression information
// --------------------------------------------------------------------------------
-unsigned int DSIGTransformXPathFilter::getExprNum(void) {
+unsigned int DSIGTransformXPathFilter::getExprNum() const {
return (unsigned int) m_exprs.size();
}
-DSIGXPathFilterExpr * DSIGTransformXPathFilter::expr(unsigned int n) {
+DSIGXPathFilterExpr* DSIGTransformXPathFilter::expr(unsigned int n) const {
if (n < m_exprs.size())
return m_exprs[n];
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.hpp Wed Dec 13 03:18:57 2017
@@ -113,15 +113,6 @@ public:
//@{
/**
- * \brief Determine the transform type.
- *
- * Used to determine what the type of the transform is.
- *
- */
-
- virtual transformType getTransformType() const;
-
- /**
* \brief Create the XPath Filter Transformer class.
*
* Create the transformer associated with this XPath transform.
@@ -180,7 +171,7 @@ public:
* @returns The number of expressions
*/
- unsigned int getExprNum(void);
+ unsigned int getExprNum() const;
/**
* \brief Get expression.
@@ -192,7 +183,7 @@ public:
* @returns The indicated expression
*/
- DSIGXPathFilterExpr * expr(unsigned int n);
+ DSIGXPathFilterExpr * expr(unsigned int n) const;
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp Wed Dec 13 03:18:57 2017
@@ -108,13 +108,6 @@ DSIGTransformXSL::~DSIGTransformXSL() {}
// --------------------------------------------------------------------------------
-transformType DSIGTransformXSL::getTransformType() const {
-
- return TRANSFORM_XSLT;
-
-}
-
-
void DSIGTransformXSL::appendTransformer(TXFMChain * input) {
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.hpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.hpp Wed Dec 13 03:18:57 2017
@@ -97,15 +97,6 @@ public:
//@{
/**
- * \brief Determine the transform type.
- *
- * Used to determine what the type of the transform is.
- *
- */
-
- virtual transformType getTransformType() const;
-
- /**
* \brief Create the XSLT transformer element.
*
*/
Modified: santuario/xml-security-cpp/trunk/xsec/tools/siginf/siginf.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/tools/siginf/siginf.cpp?rev=1817973&r1=1817972&r2=1817973&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/tools/siginf/siginf.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/tools/siginf/siginf.cpp Wed Dec 13 03:18:57 2017
@@ -134,130 +134,113 @@ void levelSet(unsigned int level) {
}
-void outputTransform(DSIGTransform * t, unsigned int level) {
+void outputTransform(const DSIGTransform * t, unsigned int level) {
- switch (t->getTransformType()) {
-
- case (TRANSFORM_BASE64) :
+ if (dynamic_cast<const DSIGTransformBase64*>(t)) {
cout << "Base64 Decode" << endl;
- return;
-
- case (TRANSFORM_C14N) :
- cout << "c14n 1.0 canonicalisation ";
- if (((DSIGTransformC14n *) t)->getCanonicalizationMethod() == CANON_C14N_NOC)
- cout << "(without comments)" << endl;
- else
- cout << "(with comments)" << endl;
- return;
-
- case (TRANSFORM_C14N11) :
- cout << "c14n 1.1 canonicalisation ";
- if (((DSIGTransformC14n *) t)->getCanonicalizationMethod() == CANON_C14N11_NOC)
- cout << "(without comments)" << endl;
- else
- cout << "(with comments)" << endl;
- return;
-
- case (TRANSFORM_EXC_C14N) :
-
- cout << "Exclusive c14n 1.0 canonicalisation ";
- if (((DSIGTransformC14n *) t)->getCanonicalizationMethod() == CANON_C14NE_NOC)
- cout << "(without comments)" << endl;
- else
- cout << "(with comments)" << endl;
-
- // Check for inclusive namespaces
-
- if (((DSIGTransformC14n *) t)->getPrefixList() != NULL) {
- levelSet(level);
- cout << "Inclusive prefixes : " <<
- X2C(((DSIGTransformC14n *) t)->getPrefixList()).str() << endl;
- }
- return;
-
- case (TRANSFORM_ENVELOPED_SIGNATURE) :
-
- cout << "enveloped signature" << endl;
- return;
-
- case (TRANSFORM_XPATH) :
- {
- DSIGTransformXPath * xp = (DSIGTransformXPath *) t;
-
- cout << "XPath" << endl;
- // Check for namespaces
- DOMNamedNodeMap * atts = xp->getNamespaces();
-
- if (atts != 0) {
-
- XMLSize_t s = atts->getLength();
- for (XMLSize_t i = 0 ; i < s; ++i) {
- levelSet(level);
- cout << "Namespace : " << X2C(atts->item(i)->getNodeName()).str() <<
- "=\"" << X2C(atts->item(i)->getNodeValue()).str() << "\"\n";
- }
- }
- levelSet(level);
- // Hmm - this is really a bug. This should return a XMLCh string
- cout << "Expr : " << xp->getExpression() << endl;
- return;
- }
-
- case (TRANSFORM_XPATH_FILTER) :
- {
- DSIGTransformXPathFilter * xpf = (DSIGTransformXPathFilter *) t;
-
- cout << "XPath-Filter2" << endl;
-
- unsigned int s = xpf->getExprNum();
-
- for (unsigned int i = 0; i < s; ++i) {
-
- levelSet(level);
- cout << "Filter : ";
-
- DSIGXPathFilterExpr * e = xpf->expr(i);
-
- switch (e->getFilterType()) {
-
- case FILTER_UNION :
- cout << "union : \"";
- break;
- case FILTER_INTERSECT :
- cout << "intersect : \"";
- break;
- default :
- cout << "subtract : \"";
-
- }
-
- // Now the expression
- char * str = XMLString::transcode(e->getFilter());
- cout << str << "\"" << endl;
- XSEC_RELEASE_XMLCH(str);
-
- }
-
- break;
-
- }
-
- case (TRANSFORM_XSLT) :
- {
-
- cout << "XSLT" << endl;
- // Really should serialise and output stylesheet.
- return;
-
- }
-
- default :
-
+ }
+ else if (dynamic_cast<const DSIGTransformC14n*>(t)) {
+ switch (dynamic_cast<const DSIGTransformC14n*>(t)->getCanonicalizationMethod()) {
+ case CANON_C14N_NOC:
+ cout << "c14n 1.0 canonicalization (without comments)" << endl;
+ break;
+
+ case CANON_C14N_COM:
+ cout << "c14n 1.0 canonicalization (with comments)" << endl;
+ break;
+
+ case CANON_C14N11_NOC:
+ cout << "c14n 1.1 canonicalization (without comments)" << endl;
+ break;
+
+ case CANON_C14N11_COM:
+ cout << "c14n 1.1 canonicalization (with comments)" << endl;
+ break;
+
+ case CANON_C14NE_NOC:
+ cout << "Exclusive c14n 1.0 canonicalization (without comments)" << endl;
+ if (dynamic_cast<const DSIGTransformC14n*>(t)->getPrefixList() != NULL) {
+ levelSet(level);
+ cout << "Inclusive prefixes : " <<
+ X2C(dynamic_cast<const DSIGTransformC14n*>(t)->getPrefixList()).str() << endl;
+ }
+ break;
+
+ case CANON_C14NE_COM:
+ cout << "Exclusive c14n 1.0 canonicalization (with comments)" << endl;
+ if (dynamic_cast<const DSIGTransformC14n*>(t)->getPrefixList() != NULL) {
+ levelSet(level);
+ cout << "Inclusive prefixes : " <<
+ X2C(dynamic_cast<const DSIGTransformC14n*>(t)->getPrefixList()).str() << endl;
+ }
+ break;
+
+ case CANON_NONE:
+ cout << "Unknown c14n method" << endl;
+ }
+ }
+ else if (dynamic_cast<const DSIGTransformEnvelope*>(t)) {
+ cout << "enveloped signature" << endl;
+ }
+ else if (dynamic_cast<const DSIGTransformXPath*>(t)) {
+ const DSIGTransformXPath* xp = dynamic_cast<const DSIGTransformXPath*>(t);
+
+ cout << "XPath" << endl;
+ // Check for namespaces
+ DOMNamedNodeMap* atts = xp->getNamespaces();
+
+ if (atts != 0) {
+ XMLSize_t s = atts->getLength();
+ for (XMLSize_t i = 0 ; i < s; ++i) {
+ levelSet(level);
+ cout << "Namespace : " << X2C(atts->item(i)->getNodeName()).str() <<
+ "=\"" << X2C(atts->item(i)->getNodeValue()).str() << "\"\n";
+ }
+ }
+ levelSet(level);
+ // Hmm - this is really a bug. This should return a XMLCh string
+ cout << "Expr : " << xp->getExpression() << endl;
+ }
+ else if (dynamic_cast<const DSIGTransformXPathFilter*>(t)) {
+ const DSIGTransformXPathFilter * xpf = dynamic_cast<const DSIGTransformXPathFilter*>(t);
+
+ cout << "XPath-Filter2" << endl;
+
+ unsigned int s = xpf->getExprNum();
+
+ for (unsigned int i = 0; i < s; ++i) {
+
+ levelSet(level);
+ cout << "Filter : ";
+
+ const DSIGXPathFilterExpr * e = xpf->expr(i);
+
+ switch (e->getFilterType()) {
+
+ case FILTER_UNION :
+ cout << "union : \"";
+ break;
+ case FILTER_INTERSECT :
+ cout << "intersect : \"";
+ break;
+ default :
+ cout << "subtract : \"";
+ }
+
+ // Now the expression
+ char * str = XMLString::transcode(e->getFilter());
+ cout << str << "\"" << endl;
+ XSEC_RELEASE_XMLCH(str);
+ }
+ }
+ else if (dynamic_cast<const DSIGTransformXSL*>(t)) {
+ cout << "XSLT" << endl;
+ // Really should serialise and output stylesheet.
+ }
+ else {
cout << "unknown transform type" << endl;
-
- }
-
+ }
}
void outputReferences(DSIGReferenceList *rl, unsigned int level) {