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 2012/06/14 00:31:04 UTC
svn commit: r1350043 - in /santuario/xml-security-cpp/trunk/xsec/framework:
XSECEnv.cpp XSECEnv.hpp
Author: scantor
Date: Wed Jun 13 22:31:04 2012
New Revision: 1350043
URL: http://svn.apache.org/viewvc?rev=1350043&view=rev
Log:
Add XML Enc 1.1 namespace.
Modified:
santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.hpp
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp?rev=1350043&r1=1350042&r2=1350043&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp Wed Jun 13 22:31:04 2012
@@ -86,6 +86,18 @@ const XMLCh s_defaultXENCPrefix[] = {
};
+const XMLCh s_defaultXENC11Prefix[] = {
+
+ chLatin_x,
+ chLatin_e,
+ chLatin_n,
+ chLatin_c,
+ chDigit_1,
+ chDigit_1,
+ chNull
+
+};
+
const XMLCh s_defaultXKMSPrefix[] = {
chLatin_x,
@@ -132,6 +144,7 @@ XSECEnv::XSECEnv(DOMDocument *doc) {
mp_ecPrefixNS = XMLString::replicate(s_defaultECPrefix);
mp_xpfPrefixNS = XMLString::replicate(s_defaultXPFPrefix);
mp_xencPrefixNS = XMLString::replicate(s_defaultXENCPrefix);
+ mp_xenc11PrefixNS = XMLString::replicate(s_defaultXENC11Prefix);
mp_xkmsPrefixNS = XMLString::replicate(s_defaultXKMSPrefix);
m_prettyPrintFlag = true;
@@ -159,6 +172,7 @@ XSECEnv::XSECEnv(const XSECEnv & theOthe
mp_ecPrefixNS = XMLString::replicate(theOther.mp_ecPrefixNS);
mp_xpfPrefixNS = XMLString::replicate(theOther.mp_xpfPrefixNS);
mp_xencPrefixNS = XMLString::replicate(theOther.mp_xencPrefixNS);
+ mp_xenc11PrefixNS = XMLString::replicate(s_defaultXENC11Prefix);
mp_xkmsPrefixNS = XMLString::replicate(theOther.mp_xkmsPrefixNS);
m_prettyPrintFlag = theOther.m_prettyPrintFlag;
@@ -207,6 +221,10 @@ XSECEnv::~XSECEnv() {
XSEC_RELEASE_XMLCH(mp_xencPrefixNS);
}
+ if (mp_xenc11PrefixNS != NULL) {
+ XSEC_RELEASE_XMLCH(mp_xenc11PrefixNS);
+ }
+
if (mp_xkmsPrefixNS != NULL) {
XSEC_RELEASE_XMLCH(mp_xkmsPrefixNS);
}
@@ -302,6 +320,15 @@ void XSECEnv::setXENCNSPrefix(const XMLC
}
+void XSECEnv::setXENC11NSPrefix(const XMLCh * prefix) {
+
+ if (mp_xenc11PrefixNS != NULL)
+ XSEC_RELEASE_XMLCH(mp_xenc11PrefixNS);
+
+ mp_xenc11PrefixNS = XMLString::replicate(prefix);
+
+}
+
void XSECEnv::setXKMSNSPrefix(const XMLCh * prefix) {
if (mp_xkmsPrefixNS != NULL)
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.hpp?rev=1350043&r1=1350042&r2=1350043&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.hpp Wed Jun 13 22:31:04 2012
@@ -159,6 +159,15 @@ public:
void setXENCNSPrefix(const XMLCh * prefix);
/**
+ * \brief Set prefix for XENC 1.1 nodes
+ *
+ * Set the namespace prefix the library will use when creating
+ * nodes in the XENC 1.1 namespace
+ */
+
+ void setXENC11NSPrefix(const XMLCh * prefix);
+
+ /**
* \brief Set prefix for XKMS nodes
*
* Set the namespace prefix the library will use when creating
@@ -217,6 +226,16 @@ public:
const XMLCh * getXENCNSPrefix(void) const {return mp_xencPrefixNS;}
/**
+ * \brief Get the NS Prefix being used for XENC 1.1 elements.
+ *
+ * @returns A pointer to the buffer holding the prefix
+ * @see #setXENC11NSPrefix
+ *
+ */
+
+ const XMLCh * getXENC11NSPrefix() const {return mp_xenc11PrefixNS;}
+
+ /**
* \brief Get namespace prefix for XKMS nodes
*
* Find the string being used by the library to prefix nodes in the
@@ -524,11 +543,12 @@ private:
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
* mp_doc;
// For creating functions
- XMLCh * mp_prefixNS;
- XMLCh * mp_11PrefixNS;
+ XMLCh * mp_prefixNS;
+ XMLCh * mp_11PrefixNS;
XMLCh * mp_ecPrefixNS;
XMLCh * mp_xpfPrefixNS;
XMLCh * mp_xencPrefixNS;
+ XMLCh * mp_xenc11PrefixNS;
XMLCh * mp_xkmsPrefixNS;
// Resolvers