projects
/
shibboleth
/
xmltooling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor extraction of certificate details.
[shibboleth/xmltooling.git]
/
xmltooling
/
signature
/
KeyInfo.h
diff --git
a/xmltooling/signature/KeyInfo.h
b/xmltooling/signature/KeyInfo.h
index
3981b3d
..
d9382a8
100644
(file)
--- a/
xmltooling/signature/KeyInfo.h
+++ b/
xmltooling/signature/KeyInfo.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-200
6
Internet2
+ * Copyright 2001-200
7
Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-15,7
+15,7
@@
*/
/**
*/
/**
- * @file KeyInfo.h
+ * @file
xmltooling/signature/
KeyInfo.h
*
* XMLObjects representing XML Digital Signature, version 20020212, KeyInfo element
* and related content.
*
* XMLObjects representing XML Digital Signature, version 20020212, KeyInfo element
* and related content.
@@
-25,14
+25,16
@@
#define __xmltooling_keyinfo_h__
#include <xmltooling/ElementProxy.h>
#define __xmltooling_keyinfo_h__
#include <xmltooling/ElementProxy.h>
-#include <xmltooling/exceptions.h>
-#include <xmltooling/SimpleElement.h>
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/util/XMLConstants.h>
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/util/XMLConstants.h>
-#include <xmltooling/validation/ValidatingXMLObject.h>
+/**
+ * Macro for declaring signature builders.
+ *
+ * @param cname name of class being built
+ */
#define DECL_XMLSIGOBJECTBUILDER(cname) \
#define DECL_XMLSIGOBJECTBUILDER(cname) \
- DECL_XMLOBJECTBUILDER(XMLTOOL_API,cname,xml
tooling::XMLConstants::XMLSIG_NS,xmltooling::XMLC
onstants::XMLSIG_PREFIX)
+ DECL_XMLOBJECTBUILDER(XMLTOOL_API,cname,xml
constants::XMLSIG_NS,xmlc
onstants::XMLSIG_PREFIX)
namespace xmlsignature {
namespace xmlsignature {
@@
-77,15
+79,15
@@
namespace xmlsignature {
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(XMLTOOL_API,KeyValue,xmltooling::
SimpleElemen
t,XML Digital Signature version 20020212 KeyValue element);
+ BEGIN_XMLOBJECT(XMLTOOL_API,KeyValue,xmltooling::
XMLObjec
t,XML Digital Signature version 20020212 KeyValue element);
DECL_TYPED_CHILD(DSAKeyValue);
DECL_TYPED_CHILD(RSAKeyValue);
DECL_TYPED_CHILD(DSAKeyValue);
DECL_TYPED_CHILD(RSAKeyValue);
- DECL_XMLOBJECT_CHILD(
OtherKeyValue
);
+ DECL_XMLOBJECT_CHILD(
UnknownXMLObject
);
/** KeyValueType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
/** KeyValueType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(XMLTOOL_API,Transform,xmltooling::Element
Proxy
,XML Digital Signature version 20020212 Transform element);
+ BEGIN_XMLOBJECT(XMLTOOL_API,Transform,xmltooling::Element
ExtensibleXMLObject
,XML Digital Signature version 20020212 Transform element);
DECL_STRING_ATTRIB(Algorithm,ALGORITHM);
DECL_TYPED_CHILDREN(XPath);
/** TransformType local name */
DECL_STRING_ATTRIB(Algorithm,ALGORITHM);
DECL_TYPED_CHILDREN(XPath);
/** TransformType local name */
@@
-104,6
+106,12
@@
namespace xmlsignature {
DECL_TYPED_CHILD(Transforms);
/** RetrievalMethodType local name */
static const XMLCh TYPE_NAME[];
DECL_TYPED_CHILD(Transforms);
/** RetrievalMethodType local name */
static const XMLCh TYPE_NAME[];
+ /** DSAKeyValue RetrievalMethod Type */
+ static const XMLCh TYPE_DSAKEYVALUE[];
+ /** RSAKeyValue RetrievalMethod Type */
+ static const XMLCh TYPE_RSAKEYVALUE[];
+ /** X509Data RetrievalMethod Type */
+ static const XMLCh TYPE_X509DATA[];
END_XMLOBJECT;
BEGIN_XMLOBJECT(XMLTOOL_API,X509IssuerSerial,xmltooling::XMLObject,XML Digital Signature version 20020212 X509IssuerSerial element);
END_XMLOBJECT;
BEGIN_XMLOBJECT(XMLTOOL_API,X509IssuerSerial,xmltooling::XMLObject,XML Digital Signature version 20020212 X509IssuerSerial element);
@@
-113,13
+121,12
@@
namespace xmlsignature {
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(XMLTOOL_API,X509Data,xmltooling::XMLObject,XML Digital Signature version 20020212 X509Data element);
+ BEGIN_XMLOBJECT(XMLTOOL_API,X509Data,xmltooling::
ElementExtensible
XMLObject,XML Digital Signature version 20020212 X509Data element);
DECL_TYPED_CHILDREN(X509IssuerSerial);
DECL_TYPED_CHILDREN(X509SKI);
DECL_TYPED_CHILDREN(X509SubjectName);
DECL_TYPED_CHILDREN(X509Certificate);
DECL_TYPED_CHILDREN(X509CRL);
DECL_TYPED_CHILDREN(X509IssuerSerial);
DECL_TYPED_CHILDREN(X509SKI);
DECL_TYPED_CHILDREN(X509SubjectName);
DECL_TYPED_CHILDREN(X509Certificate);
DECL_TYPED_CHILDREN(X509CRL);
- DECL_XMLOBJECT_CHILDREN(OtherX509Data);
/** X509DataType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
/** X509DataType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
@@
-135,15
+142,14
@@
namespace xmlsignature {
virtual const std::vector< std::pair<SPKISexp*,xmltooling::XMLObject*> >& getSPKISexps() const=0;
END_XMLOBJECT;
virtual const std::vector< std::pair<SPKISexp*,xmltooling::XMLObject*> >& getSPKISexps() const=0;
END_XMLOBJECT;
- BEGIN_XMLOBJECT(XMLTOOL_API,PGPData,xmltooling::XMLObject,XML Digital Signature version 20020212 PGPData element);
+ BEGIN_XMLOBJECT(XMLTOOL_API,PGPData,xmltooling::
ElementExtensible
XMLObject,XML Digital Signature version 20020212 PGPData element);
DECL_TYPED_CHILD(PGPKeyID);
DECL_TYPED_CHILD(PGPKeyPacket);
DECL_TYPED_CHILD(PGPKeyID);
DECL_TYPED_CHILD(PGPKeyPacket);
- DECL_XMLOBJECT_CHILDREN(PGPDataExtension);
/** PGPDataType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
/** PGPDataType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(XMLTOOL_API,KeyInfo,xmltooling::XMLObject,XML Digital Signature version 20020212 KeyInfo element);
+ BEGIN_XMLOBJECT(XMLTOOL_API,KeyInfo,xmltooling::
ElementExtensible
XMLObject,XML Digital Signature version 20020212 KeyInfo element);
DECL_STRING_ATTRIB(Id,ID);
DECL_TYPED_CHILDREN(X509Data);
DECL_TYPED_CHILDREN(KeyName);
DECL_STRING_ATTRIB(Id,ID);
DECL_TYPED_CHILDREN(X509Data);
DECL_TYPED_CHILDREN(KeyName);
@@
-152,7
+158,6
@@
namespace xmlsignature {
DECL_TYPED_CHILDREN(MgmtData);
DECL_TYPED_CHILDREN(PGPData);
DECL_TYPED_CHILDREN(SPKIData);
DECL_TYPED_CHILDREN(MgmtData);
DECL_TYPED_CHILDREN(PGPData);
DECL_TYPED_CHILDREN(SPKIData);
- DECL_XMLOBJECT_CHILDREN(Other);
/** KeyInfoType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
/** KeyInfoType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
@@
-194,6
+199,7
@@
namespace xmlsignature {
* Registers builders and validators for KeyInfo classes into the runtime.
*/
void XMLTOOL_API registerKeyInfoClasses();
* Registers builders and validators for KeyInfo classes into the runtime.
*/
void XMLTOOL_API registerKeyInfoClasses();
+
};
#endif /* __xmltooling_keyinfo_h__ */
};
#endif /* __xmltooling_keyinfo_h__ */