projects
/
shibboleth
/
cpp-xmltooling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add XMLEnc 1.1 constants and MGF supporting code
[shibboleth/cpp-xmltooling.git]
/
xmltooling
/
encryption
/
Encryption.h
diff --git
a/xmltooling/encryption/Encryption.h
b/xmltooling/encryption/Encryption.h
index
934088b
..
33c5e12
100644
(file)
--- a/
xmltooling/encryption/Encryption.h
+++ b/
xmltooling/encryption/Encryption.h
@@
-48,6
+48,14
@@
namespace xmlsignature {
DECL_XMLOBJECTBUILDER(XMLTOOL_API,cname,xmlconstants::XMLENC_NS,xmlconstants::XMLENC_PREFIX)
/**
DECL_XMLOBJECTBUILDER(XMLTOOL_API,cname,xmlconstants::XMLENC_NS,xmlconstants::XMLENC_PREFIX)
/**
+ * Macro for declaring encryption 1.1 builders.
+ *
+ * @param cname name of class being built
+ */
+#define DECL_XMLENC11OBJECTBUILDER(cname) \
+ DECL_XMLOBJECTBUILDER(XMLTOOL_API,cname,xmlconstants::XMLENC11_NS,xmlconstants::XMLENC11_PREFIX)
+
+/**
* @namespace xmlencryption
* Namespace for XML Encryption schema objects
*/
* @namespace xmlencryption
* Namespace for XML Encryption schema objects
*/
@@
-146,6
+154,12
@@
namespace xmlencryption {
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
+ BEGIN_XMLOBJECT(XMLTOOL_API,MGF,xmltooling::XMLObject,XML Encryption 1.1 MGF element);
+ DECL_STRING_ATTRIB(Algorithm,ALGORITHM);
+ /** MGFType local name */
+ static const XMLCh TYPE_NAME[];
+ END_XMLOBJECT;
+
DECL_XMLENCOBJECTBUILDER(CarriedKeyName);
DECL_XMLENCOBJECTBUILDER(CipherData);
DECL_XMLENCOBJECTBUILDER(CipherReference);
DECL_XMLENCOBJECTBUILDER(CarriedKeyName);
DECL_XMLENCOBJECTBUILDER(CipherData);
DECL_XMLENCOBJECTBUILDER(CipherReference);
@@
-162,6
+176,8
@@
namespace xmlencryption {
DECL_XMLENCOBJECTBUILDER(ReferenceList);
DECL_XMLENCOBJECTBUILDER(Transforms);
DECL_XMLENCOBJECTBUILDER(ReferenceList);
DECL_XMLENCOBJECTBUILDER(Transforms);
+ DECL_XMLENC11OBJECTBUILDER(MGF);
+
/**
* Registers builders and validators for XML Encryption classes into the runtime.
*/
/**
* Registers builders and validators for XML Encryption classes into the runtime.
*/