blautenb 2003/10/06 05:16:38
Modified: c/src/dsig DSIGKeyInfoList.cpp DSIGKeyInfoPGPData.cpp
DSIGKeyInfoSPKIData.cpp DSIGKeyInfoValue.cpp
DSIGKeyInfoX509.cpp DSIGReference.cpp
DSIGSignature.cpp DSIGSignature.hpp
DSIGSignedInfo.cpp DSIGTransformC14n.cpp
DSIGTransformXPathFilter.cpp
c/src/framework XSECEnv.cpp XSECEnv.hpp XSECW32Config.hpp
c/src/tools/xtest xtest.cpp
c/src/xenc XENCCipher.hpp
c/src/xenc/impl XENCCipherDataImpl.cpp XENCCipherImpl.cpp
XENCCipherImpl.hpp XENCEncryptedTypeImpl.cpp
Log:
Implemented control around pretty printing
Revision Changes Path
1.14 +10 -10 xml-security/c/src/dsig/DSIGKeyInfoList.cpp
Index: DSIGKeyInfoList.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoList.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DSIGKeyInfoList.cpp 3 Oct 2003 09:55:02 -0000 1.13
+++ DSIGKeyInfoList.cpp 6 Oct 2003 12:16:37 -0000 1.14
@@ -448,7 +448,7 @@
DOMElement * ret =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_keyInfoNode = ret;
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
return ret;
@@ -473,7 +473,7 @@
XSECnew(v, DSIGKeyInfoValue(mp_env));
mp_keyInfoNode->appendChild(v->createBlankDSAKeyValue(P, Q, G, Y));
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
// Add to the list
addKeyInfo(v);
@@ -498,7 +498,7 @@
XSECnew(v, DSIGKeyInfoValue(mp_env));
mp_keyInfoNode->appendChild(v->createBlankRSAKeyValue(modulus,
exponent));
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
// Add to the list
addKeyInfo(v);
@@ -523,7 +523,7 @@
XSECnew(x, DSIGKeyInfoX509(mp_env));
mp_keyInfoNode->appendChild(x->createBlankX509Data());
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
// Add to the list
addKeyInfo(x);
@@ -547,7 +547,7 @@
XSECnew(n, DSIGKeyInfoName(mp_env));
mp_keyInfoNode->appendChild(n->createBlankKeyName(name, isDName));
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
// Add to the list
addKeyInfo(n);
@@ -571,7 +571,7 @@
XSECnew(p, DSIGKeyInfoPGPData(mp_env));
mp_keyInfoNode->appendChild(p->createBlankPGPData(id, packet));
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
addKeyInfo(p);
@@ -594,7 +594,7 @@
XSECnew(s, DSIGKeyInfoSPKIData(mp_env));
mp_keyInfoNode->appendChild(s->createBlankSPKIData(sexp));
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
addKeyInfo(s);
@@ -617,7 +617,7 @@
XSECnew(m, DSIGKeyInfoMgmtData(mp_env));
mp_keyInfoNode->appendChild(m->createBlankMgmtData(data));
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
addKeyInfo(m);
@@ -640,7 +640,7 @@
DOMDocument * doc = mp_env->getParentDocument();
mp_keyInfoNode->appendChild(ref->getKeyInfoDOMNode());
-
mp_keyInfoNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoNode);
addKeyInfo(ref);
1.5 +8 -7 xml-security/c/src/dsig/DSIGKeyInfoPGPData.cpp
Index: DSIGKeyInfoPGPData.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoPGPData.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGKeyInfoPGPData.cpp 12 Sep 2003 09:47:17 -0000 1.4
+++ DSIGKeyInfoPGPData.cpp 6 Oct 2003 12:16:37 -0000 1.5
@@ -210,14 +210,14 @@
DOMElement *ret =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_keyInfoDOMNode = ret;
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
if (id != NULL) {
makeQName(str, prefix, "PGPKeyID");
DOMElement * t =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
ret->appendChild(t);
-
ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
mp_keyIDTextNode = doc->createTextNode(id);
t->appendChild(mp_keyIDTextNode);
mp_keyID = mp_keyIDTextNode->getNodeValue();
@@ -229,7 +229,7 @@
makeQName(str, prefix, "PGPKeyPacket");
DOMElement * t =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
ret->appendChild(t);
-
ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
mp_keyPacketTextNode = doc->createTextNode(packet);
t->appendChild(mp_keyPacketTextNode);
mp_keyPacket = mp_keyPacketTextNode->getNodeValue();
@@ -260,11 +260,12 @@
DOMNode * pkt = findFirstChildOfType(mp_keyInfoDOMNode,
DOMNode::ELEMENT_NODE);
if (pkt != NULL) {
mp_keyInfoDOMNode->insertBefore(t, pkt);
-
mp_keyInfoDOMNode->insertBefore(doc->createTextNode(DSIGConstants::s_unicodeStrNL),
pkt);
+ if (mp_env->getPrettyPrintFlag() == true)
+
mp_keyInfoDOMNode->insertBefore(doc->createTextNode(DSIGConstants::s_unicodeStrNL),
pkt);
}
else {
mp_keyInfoDOMNode->appendChild(t);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
}
mp_keyIDTextNode = doc->createTextNode(id);
t->appendChild(mp_keyIDTextNode);
@@ -297,7 +298,7 @@
makeQName(str, prefix, "PGPKeyPacket");
DOMElement * t =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_keyInfoDOMNode->appendChild(t);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
mp_keyPacketTextNode = doc->createTextNode(packet);
t->appendChild(mp_keyPacketTextNode);
1.6 +3 -3 xml-security/c/src/dsig/DSIGKeyInfoSPKIData.cpp
Index: DSIGKeyInfoSPKIData.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoSPKIData.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGKeyInfoSPKIData.cpp 12 Sep 2003 09:47:17 -0000 1.5
+++ DSIGKeyInfoSPKIData.cpp 6 Oct 2003 12:16:37 -0000 1.6
@@ -204,7 +204,7 @@
DOMElement * ret =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_keyInfoDOMNode = ret;
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
appendSexp(Sexp);
@@ -234,7 +234,7 @@
tmpElt->appendChild(s->mp_exprTextNode);
mp_keyInfoDOMNode->appendChild(tmpElt);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
}
1.6 +13 -13 xml-security/c/src/dsig/DSIGKeyInfoValue.cpp
Index: DSIGKeyInfoValue.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoValue.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGKeyInfoValue.cpp 12 Sep 2003 09:47:17 -0000 1.5
+++ DSIGKeyInfoValue.cpp 6 Oct 2003 12:16:37 -0000 1.6
@@ -290,10 +290,10 @@
makeQName(str, prefix, "DSAKeyValue");
DOMElement * dsa =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
ret->appendChild(dsa);
- dsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(dsa);
+ mp_env->doPrettyPrint(ret);
// Now create the value children
@@ -301,28 +301,28 @@
DOMElement * v =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_PTextNode = doc->createTextNode(P);
dsa->appendChild(v);
- dsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(dsa);
v->appendChild(mp_PTextNode);
makeQName(str, prefix, "Q");
v = doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG,
str.rawXMLChBuffer());
mp_PTextNode = doc->createTextNode(Q);
dsa->appendChild(v);
- dsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(dsa);
v->appendChild(mp_PTextNode);
makeQName(str, prefix, "G");
v = doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG,
str.rawXMLChBuffer());
mp_PTextNode = doc->createTextNode(G);
dsa->appendChild(v);
- dsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(dsa);
v->appendChild(mp_PTextNode);
makeQName(str, prefix, "Y");
v = doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG,
str.rawXMLChBuffer());
mp_PTextNode = doc->createTextNode(Y);
dsa->appendChild(v);
- dsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(dsa);
v->appendChild(mp_PTextNode);
return ret;
@@ -405,10 +405,10 @@
makeQName(str, prefix, "RSAKeyValue");
DOMElement * rsa =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
ret->appendChild(rsa);
- rsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(rsa);
+ mp_env->doPrettyPrint(ret);
// Now create the value children
@@ -416,14 +416,14 @@
DOMElement * v =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_modulusTextNode = doc->createTextNode(modulus);
rsa->appendChild(v);
- rsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(rsa);
v->appendChild(mp_modulusTextNode);
makeQName(str, prefix, "Exponent");
v = doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG,
str.rawXMLChBuffer());
mp_exponentTextNode = doc->createTextNode(exponent);
rsa->appendChild(v);
- rsa->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(rsa);
v->appendChild(mp_exponentTextNode);
return ret;
1.10 +10 -10 xml-security/c/src/dsig/DSIGKeyInfoX509.cpp
Index: DSIGKeyInfoX509.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoX509.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DSIGKeyInfoX509.cpp 12 Sep 2003 09:47:17 -0000 1.9
+++ DSIGKeyInfoX509.cpp 6 Oct 2003 12:16:37 -0000 1.10
@@ -391,7 +391,7 @@
DOMElement *ret =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_keyInfoDOMNode = ret;
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
return ret;
@@ -413,7 +413,7 @@
// Add to the over-arching node
mp_keyInfoDOMNode->appendChild(s);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
}
@@ -443,7 +443,7 @@
// Add to the over-arching node
mp_keyInfoDOMNode->appendChild(s);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
}
@@ -483,7 +483,7 @@
// Add to the over-arching node
mp_keyInfoDOMNode->appendChild(s);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
}
@@ -515,7 +515,7 @@
makeQName(str, prefix, "X509IssuerSerial");
DOMElement * s =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
-
s->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(s);
// Create the text nodes with the contents
@@ -529,19 +529,19 @@
t->appendChild(mp_X509IssuerNameTextNode);
s->appendChild(t);
-
s->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(s);
makeQName(str, prefix, "X509SerialNumber");
t = doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG,
str.rawXMLChBuffer());
t->appendChild(mp_X509SerialNumberTextNode);
s->appendChild(t);
-
s->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(s);
// Add to the over-arching X509Data
mp_keyInfoDOMNode->appendChild(s);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
}
@@ -576,7 +576,7 @@
s->appendChild(b64Txt);
mp_keyInfoDOMNode->appendChild(s);
-
mp_keyInfoDOMNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_keyInfoDOMNode);
// Add to the list
1.16 +9 -8 xml-security/c/src/dsig/DSIGReference.cpp
Index: DSIGReference.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DSIGReference.cpp 15 Sep 2003 11:57:44 -0000 1.15
+++ DSIGReference.cpp 6 Oct 2003 12:16:37 -0000 1.16
@@ -224,8 +224,9 @@
makeQName(str, prefix, "Transforms");
mp_transformsNode =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
mp_referenceNode->insertBefore(mp_transformsNode,
mp_referenceNode->getFirstChild());
-
mp_referenceNode->insertBefore(doc->createTextNode(DSIGConstants::s_unicodeStrNL),
mp_transformsNode);
-
mp_transformsNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ if (mp_env->getPrettyPrintFlag() == true)
+
mp_referenceNode->insertBefore(doc->createTextNode(DSIGConstants::s_unicodeStrNL),
mp_transformsNode);
+ mp_env->doPrettyPrint(mp_transformsNode);
// Create the list
XSECnew(mp_transformList, DSIGTransformList());
@@ -241,7 +242,7 @@
createTransformList();
mp_transformsNode->appendChild(txfmElt);
-
mp_transformsNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_transformsNode);
mp_transformList->addTransform(txfm);
}
@@ -328,7 +329,7 @@
txfmElt = txfm->createBlankTransform(mp_env->getParentDocument());
addTransform(txfm, txfmElt);
-
txfmElt->appendChild(mp_env->getParentDocument()->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(txfmElt);
return txfm;
}
@@ -378,9 +379,9 @@
// Create hash and hashValue nodes
makeQName(str, prefix, "DigestMethod");
DOMElement *digestMethod =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
ret->appendChild(digestMethod);
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
if (!hashMethod2URI(str, hm)) {
@@ -396,7 +397,7 @@
makeQName(str, prefix, "DigestValue");
mp_hashValueNode =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
ret->appendChild(mp_hashValueNode);
- ret->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(ret);
mp_hashValueNode->appendChild(doc->createTextNode(MAKE_UNICODE_STRING("Not yet
calculated")));
m_loaded = true;
1.26 +26 -7 xml-security/c/src/dsig/DSIGSignature.cpp
Index: DSIGSignature.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignature.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DSIGSignature.cpp 17 Sep 2003 10:10:21 -0000 1.25
+++ DSIGSignature.cpp 6 Oct 2003 12:16:37 -0000 1.26
@@ -451,6 +451,24 @@
return m_errStr.rawXMLChBuffer();
}
+
+//
--------------------------------------------------------------------------------
+// Pretty Printing
+//
--------------------------------------------------------------------------------
+
+void DSIGSignature::setPrettyPrint(bool flag) {
+
+ mp_env->setPrettyPrintFlag(flag);
+
+}
+
+
+bool DSIGSignature::getPrettyPrint(void) {
+
+ return mp_env->getPrettyPrintFlag();
+
+}
+
//
--------------------------------------------------------------------------------
// Creating signatures from blank
//
--------------------------------------------------------------------------------
@@ -525,13 +543,13 @@
mp_sigNode = sigNode;
-
mp_sigNode->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_sigNode);
// Create the skeleton SignedInfo
XSECnew(mp_signedInfo, DSIGSignedInfo(mp_doc, mp_formatter, mp_env));
mp_sigNode->appendChild(mp_signedInfo->createBlankSignedInfo(cm, sm,
hm));
-
mp_sigNode->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_sigNode);
// Create a dummy signature value (dummy until signed)
@@ -540,7 +558,7 @@
str.rawXMLChBuffer());
mp_signatureValueNode = sigValNode;
mp_sigNode->appendChild(sigValNode);
-
mp_sigNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_sigNode);
// Some text to mark this as a template only
sigValNode->appendChild(doc->createTextNode(MAKE_UNICODE_STRING("Not
yet signed")));
@@ -606,12 +624,13 @@
if (afterSignatureValue == 0) {
mp_sigNode->appendChild(mp_KeyInfoNode);
-
mp_sigNode->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_sigNode);
}
else {
mp_sigNode->insertBefore(mp_KeyInfoNode, afterSignatureValue);
-
mp_sigNode->insertBefore(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL),
- afterSignatureValue);
+ if (mp_env->getPrettyPrintFlag() == true)
+
mp_sigNode->insertBefore(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL),
+ afterSignatureValue);
}
}
1.17 +22 -1 xml-security/c/src/dsig/DSIGSignature.hpp
Index: DSIGSignature.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignature.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DSIGSignature.hpp 12 Sep 2003 09:47:17 -0000 1.16
+++ DSIGSignature.hpp 6 Oct 2003 12:16:37 -0000 1.17
@@ -300,6 +300,27 @@
void setXPFNSPrefix(const XMLCh * prefix);
/**
+ * \brief Set Pretty Print
+ *
+ * The pretty print functions controls whether the library will output
+ * CR/LF after the elements it adds to a document
+ *
+ * By default the library will do pretty printing (flag is true)
+ *
+ * @param flag Value to set for Pretty Printing (true = do pretty
printing)
+ */
+
+ void setPrettyPrint(bool flag);
+
+ /**
+ * \brief Tell caller whether PrettyPrinting is active
+ *
+ * @returns True if Pretty Printing is active, false if not
+ */
+
+ bool getPrettyPrint(void);
+
+ /**
* \brief Create a \<Signature\> DOM structure.
*
* <p>The DOM structure created is still divorced from the document.
The callee
1.8 +5 -5 xml-security/c/src/dsig/DSIGSignedInfo.cpp
Index: DSIGSignedInfo.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignedInfo.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DSIGSignedInfo.cpp 15 Sep 2003 11:57:44 -0000 1.7
+++ DSIGSignedInfo.cpp 6 Oct 2003 12:16:37 -0000 1.8
@@ -194,7 +194,7 @@
// Add the node to the end of the childeren
mp_signedInfoNode->appendChild(refNode);
-
mp_signedInfoNode->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_signedInfoNode);
// Add to the reference List
j_ref.release();
@@ -231,9 +231,9 @@
DOMElement *canMeth =
mp_doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG,
makeQName(str, prefixNS,
"CanonicalizationMethod").rawXMLChBuffer());
-
mp_signedInfoNode->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_signedInfoNode);
mp_signedInfoNode->appendChild(canMeth);
-
mp_signedInfoNode->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_signedInfoNode);
if (!canonicalizationMethod2URI(str, cm)) {
@@ -250,7 +250,7 @@
makeQName(str, prefixNS,
"SignatureMethod").rawXMLChBuffer());
mp_signedInfoNode->appendChild(sigMeth);
-
mp_signedInfoNode->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_signedInfoNode);
if (!signatureHashMethod2URI(str, sm, hm)) {
1.15 +3 -3 xml-security/c/src/dsig/DSIGTransformC14n.cpp
Index: DSIGTransformC14n.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformC14n.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DSIGTransformC14n.cpp 15 Sep 2003 11:57:44 -0000 1.14
+++ DSIGTransformC14n.cpp 6 Oct 2003 12:16:37 -0000 1.15
@@ -318,9 +318,9 @@
mp_inclNSNode = doc->createElementNS(DSIGConstants::s_unicodeStrURIEC,
str.rawXMLChBuffer());
// Add the node to the owner element
-
mp_txfmNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_txfmNode);
mp_txfmNode->appendChild(mp_inclNSNode);
-
mp_txfmNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_txfmNode);
// Set the namespace attribute
if (prefix[0] == '\0') {
1.6 +2 -2 xml-security/c/src/dsig/DSIGTransformXPathFilter.cpp
Index: DSIGTransformXPathFilter.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXPathFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGTransformXPathFilter.cpp 15 Sep 2003 11:57:44 -0000 1.5
+++ DSIGTransformXPathFilter.cpp 6 Oct 2003 12:16:37 -0000 1.6
@@ -188,7 +188,7 @@
m_exprs.push_back(e);
mp_txfmNode->appendChild(elt);
-
mp_txfmNode->appendChild(mp_env->getParentDocument()->createTextNode(DSIGConstants::s_unicodeStrNL));
+ mp_env->doPrettyPrint(mp_txfmNode);
return e;
1.4 +16 -1 xml-security/c/src/framework/XSECEnv.cpp
Index: XSECEnv.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECEnv.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSECEnv.cpp 15 Sep 2003 12:12:09 -0000 1.3
+++ XSECEnv.cpp 6 Oct 2003 12:16:37 -0000 1.4
@@ -123,6 +123,8 @@
mp_xpfPrefixNS = XMLString::replicate(s_defaultXPFPrefix);
mp_xencPrefixNS = XMLString::replicate(s_defaultXENCPrefix);
+ m_prettyPrintFlag = true;
+
mp_URIResolver = NULL;
// Set up our formatter
@@ -219,3 +221,16 @@
mp_xencPrefixNS = XMLString::replicate(prefix);
}
+
+//
--------------------------------------------------------------------------------
+// Set and Get Resolvers
+//
--------------------------------------------------------------------------------
+
+void XSECEnv::doPrettyPrint(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node)
const {
+
+ // Very simple
+ if (m_prettyPrintFlag)
+
node->appendChild(mp_doc->createTextNode(DSIGConstants::s_unicodeStrNL));
+
+}
+
1.3 +45 -1 xml-security/c/src/framework/XSECEnv.hpp
Index: XSECEnv.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECEnv.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSECEnv.hpp 15 Sep 2003 11:48:39 -0000 1.2
+++ XSECEnv.hpp 6 Oct 2003 12:16:37 -0000 1.3
@@ -223,7 +223,48 @@
//@}
+ /** @name Pretty Printing Functions */
+ //@{
+
+ /**
+ * \brief Set Pretty Print flag
+ *
+ * The pretty print flag controls whether the library will output
+ * CR/LF after the elements it adds to a document
+ *
+ * By default the library will do pretty printing (flag is true)
+ *
+ * @param flag Value to set the flag (true = do pretty printing)
+ */
+
+ void setPrettyPrintFlag(bool flag) {m_prettyPrintFlag = flag;}
+
+ /**
+ * \brief Return the current value of the PrettyPrint flag
+ *
+ * @returns The value of the pretty print flag
+ */
+
+ bool getPrettyPrintFlag(void) const {return m_prettyPrintFlag;}
+
+ /**
+ * \brief Do a pretty print output
+ *
+ * The library calls this function to perform CR/LF outputting
+ *
+ * At the moment htis is really redundant, but it is more a holder
+ * so that we can set up something in the library to allow users
+ * to install a pretty print function.
+ *
+ * @param node Node to append pretty print content to
+ */
+
+ void doPrettyPrint(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node) const;
+
+ //@}
+
/** @name General information functions */
+ //@{
/**
* \brief
@@ -306,6 +347,9 @@
// Resolvers
XSECURIResolver * mp_URIResolver;
+
+ // Flags
+ bool m_prettyPrintFlag;
XSECEnv();
1.14 +2 -2 xml-security/c/src/framework/XSECW32Config.hpp
Index: XSECW32Config.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECW32Config.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSECW32Config.hpp 11 Sep 2003 11:12:39 -0000 1.13
+++ XSECW32Config.hpp 6 Oct 2003 12:16:37 -0000 1.14
@@ -119,7 +119,7 @@
#define HAVE_OPENSSL 1
-/* #define HAVE_WINCAPI 1 */
+#define HAVE_WINCAPI 1
/*
* Macros used to determine what header files exist on this
1.22 +3 -1 xml-security/c/src/tools/xtest/xtest.cpp
Index: xtest.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/xtest/xtest.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xtest.cpp 3 Oct 2003 09:52:02 -0000 1.21
+++ xtest.cpp 6 Oct 2003 12:16:37 -0000 1.22
@@ -409,6 +409,7 @@
sig = prov.newSignature();
sig->setDSIGNSPrefix(MAKE_UNICODE_STRING("ds"));
+ sig->setPrettyPrint(true);
sigNode = sig->createBlankSignature(doc, CANON_C14N_COM,
SIGNATURE_HMAC, HASH_SHA1);
DOMElement * rootElem = doc->getDocumentElement();
@@ -797,6 +798,7 @@
cipher = prov.newCipher(doc);
cipher->setXENCNSPrefix(MAKE_UNICODE_STRING("xenc"));
+ cipher->setPrettyPrint(true);
// Set a key
1.7 +22 -1 xml-security/c/src/xenc/XENCCipher.hpp
Index: XENCCipher.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/XENCCipher.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XENCCipher.hpp 3 Oct 2003 09:50:05 -0000 1.6
+++ XENCCipher.hpp 6 Oct 2003 12:16:37 -0000 1.7
@@ -255,6 +255,14 @@
virtual XENCEncryptedData * getEncryptedData(void) = 0;
+ /**
+ * \brief Tell caller whether PrettyPrinting is active
+ *
+ * @returns True if Pretty Printing is active, false if not
+ */
+
+ virtual bool getPrettyPrint(void) = 0;
+
//@}
/** @name Setter Functions */
@@ -311,6 +319,19 @@
*/
virtual void setXENCNSPrefix(const XMLCh * prefix) = 0;
+
+ /**
+ * \brief Set Pretty Print
+ *
+ * The pretty print functions controls whether the library will output
+ * CR/LF after the elements it adds to a document
+ *
+ * By default the library will do pretty printing (flag is true)
+ *
+ * @param flag Value to set for Pretty Printing (true = do pretty
printing)
+ */
+
+ virtual void setPrettyPrint(bool flag) = 0;
//@}
1.5 +5 -1 xml-security/c/src/xenc/impl/XENCCipherDataImpl.cpp
Index: XENCCipherDataImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherDataImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XENCCipherDataImpl.cpp 15 Sep 2003 11:53:09 -0000 1.4
+++ XENCCipherDataImpl.cpp 6 Oct 2003 12:16:37 -0000 1.5
@@ -234,6 +234,8 @@
DOMElement *ret =
doc->createElementNS(DSIGConstants::s_unicodeStrURIXENC, str.rawXMLChBuffer());
mp_cipherDataNode = ret;
+ mp_env->doPrettyPrint(ret);
+
// Set the type
if (type == VALUE_TYPE) {
@@ -244,6 +246,8 @@
DOMNode * cipherValueNode =
mp_cipherValue->createBlankCipherValue(value);
ret->appendChild(cipherValueNode);
+
+ mp_env->doPrettyPrint(ret);
}
1.7 +18 -1 xml-security/c/src/xenc/impl/XENCCipherImpl.cpp
Index: XENCCipherImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XENCCipherImpl.cpp 3 Oct 2003 09:50:05 -0000 1.6
+++ XENCCipherImpl.cpp 6 Oct 2003 12:16:37 -0000 1.7
@@ -824,3 +824,20 @@
return mp_doc;
}
+
+//
--------------------------------------------------------------------------------
+// Pretty Print functions
+//
--------------------------------------------------------------------------------
+
+void XENCCipherImpl::setPrettyPrint(bool flag) {
+
+ mp_env->setPrettyPrintFlag(flag);
+
+}
+
+bool XENCCipherImpl::getPrettyPrint(void) {
+
+ return mp_env->getPrettyPrintFlag();
+
+}
+
1.8 +5 -2 xml-security/c/src/xenc/impl/XENCCipherImpl.hpp
Index: XENCCipherImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherImpl.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XENCCipherImpl.hpp 3 Oct 2003 09:50:05 -0000 1.7
+++ XENCCipherImpl.hpp 6 Oct 2003 12:16:37 -0000 1.8
@@ -121,6 +121,8 @@
{return mp_doc;}
const XMLCh * getXENCNSPrefix(void) const;
virtual XENCEncryptedData * getEncryptedData(void);
+ bool getPrettyPrint(void);
+
// Setter methods
void setKey(XSECCryptoKey * key);
@@ -128,7 +130,8 @@
void setKeyInfoResolver(const XSECKeyInfoResolver * resolver);
void setXENCNSPrefix(const XMLCh * prefix);
-
+ void setPrettyPrint(bool flag);
+
// Creation methods
XENCEncryptedData *
createEncryptedData(XENCCipherData::XENCCipherDataType type,
const XMLCh * algorithm,
1.7 +10 -1 xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.cpp
Index: XENCEncryptedTypeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XENCEncryptedTypeImpl.cpp 3 Oct 2003 09:50:05 -0000 1.6
+++ XENCEncryptedTypeImpl.cpp 6 Oct 2003 12:16:37 -0000 1.7
@@ -275,6 +275,8 @@
str.rawXMLChBuffer(),
DSIGConstants::s_unicodeStrURIXENC);
+ mp_env->doPrettyPrint(ret);
+
// Create the EncryptionMethod
if (algorithm != NULL) {
@@ -284,6 +286,8 @@
ret->appendChild(encryptionMethodNode);
+ mp_env->doPrettyPrint(ret);
+
}
// Create the cipher Data
@@ -293,6 +297,8 @@
// Add to EncryptedType
ret->appendChild(mp_cipherDataNode);
+ mp_env->doPrettyPrint(ret);
+
return ret;
}
@@ -403,6 +409,9 @@
}
mp_encryptedTypeNode->insertBefore(mp_keyInfoNode, mp_cipherDataNode);
+
+ if (mp_env->getPrettyPrintFlag() == true)
+
mp_encryptedTypeNode->insertBefore(mp_env->getParentDocument()->createTextNode(DSIGConstants::s_unicodeStrNL),
mp_cipherDataNode);
// Need to add the DS namespace
