-/*
- * Copyright 2001-2007 Internet2
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
*/
/**
* EncryptionImpl.cpp
*
- * Implementation classes for XML Encryption schema
+ * Implementation classes for XML Encryption schema.
*/
#include "internal.h"
#include "encryption/Encryption.h"
#include "io/AbstractXMLObjectMarshaller.h"
#include "io/AbstractXMLObjectUnmarshaller.h"
+#include "signature/KeyInfo.h"
#include "util/XMLHelper.h"
+#include <boost/lambda/bind.hpp>
+#include <boost/lambda/casts.hpp>
+#include <boost/lambda/if.hpp>
+#include <boost/lambda/lambda.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
using namespace xmlencryption;
using namespace xmltooling;
+using namespace xercesc;
using namespace std;
using xmlconstants::XMLENC_NS;
using xmlconstants::XMLSIG_NS;
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_Algorithm=NULL;
- m_KeySize=NULL;
- m_OAEPparams=NULL;
- m_children.push_back(NULL);
- m_children.push_back(NULL);
+ m_Algorithm=nullptr;
+ m_KeySize=nullptr;
+ m_OAEPparams=nullptr;
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
m_pos_KeySize=m_children.begin();
m_pos_OAEPparams=m_pos_KeySize;
++m_pos_OAEPparams;
}
+
public:
virtual ~EncryptionMethodImpl() {
XMLString::release(&m_Algorithm);
}
- EncryptionMethodImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ EncryptionMethodImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
init();
}
EncryptionMethodImpl(const EncryptionMethodImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
init();
- setAlgorithm(src.getAlgorithm());
- if (src.getKeySize())
- setKeySize(src.getKeySize()->cloneKeySize());
- if (src.getOAEPparams())
- setOAEPparams(src.getOAEPparams()->cloneOAEPparams());
- VectorOf(XMLObject) v=getUnknownXMLObjects();
- for (vector<XMLObject*>::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i)
- v.push_back((*i)->clone());
+ IMPL_CLONE_ATTRIB(Algorithm);
+ IMPL_CLONE_TYPED_CHILD(KeySize);
+ IMPL_CLONE_TYPED_CHILD(OAEPparams);
+ IMPL_CLONE_XMLOBJECT_CHILDREN(UnknownXMLObject);
}
IMPL_XMLOBJECT_CLONE(EncryptionMethod);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(Algorithm,ALGORITHM,NULL);
+ MARSHALL_STRING_ATTRIB(Algorithm,ALGORITHM,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(Algorithm,ALGORITHM,NULL);
+ PROC_STRING_ATTRIB(Algorithm,ALGORITHM,nullptr);
AbstractXMLObjectUnmarshaller::processAttribute(attribute);
}
};
public:
virtual ~TransformsImpl() {}
- TransformsImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ TransformsImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
}
TransformsImpl(const TransformsImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
- VectorOf(xmlsignature::Transform) v=getTransforms();
- for (vector<xmlsignature::Transform*>::const_iterator i=src.m_Transforms.begin(); i!=src.m_Transforms.end(); i++) {
- if (*i) {
- v.push_back((*i)->cloneTransform());
- }
- }
+ IMPL_CLONE_TYPED_FOREIGN_CHILDREN(Transform,xmlsignature);
}
IMPL_XMLOBJECT_CLONE(Transforms);
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_URI=NULL;
- m_Transforms=NULL;
- m_children.push_back(NULL);
+ m_URI=nullptr;
+ m_Transforms=nullptr;
+ m_children.push_back(nullptr);
m_pos_Transforms=m_children.begin();
}
+
public:
virtual ~CipherReferenceImpl() {
XMLString::release(&m_URI);
}
- CipherReferenceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ CipherReferenceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
init();
}
CipherReferenceImpl(const CipherReferenceImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
init();
- setURI(src.getURI());
- if (src.getTransforms())
- setTransforms(src.getTransforms()->cloneTransforms());
+ IMPL_CLONE_ATTRIB(URI);
+ IMPL_CLONE_TYPED_CHILD(Transforms);
}
IMPL_XMLOBJECT_CLONE(CipherReference);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(URI,URI,NULL);
+ MARSHALL_STRING_ATTRIB(URI,URI,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(URI,URI,NULL);
+ PROC_STRING_ATTRIB(URI,URI,nullptr);
AbstractXMLObjectUnmarshaller::processAttribute(attribute);
}
};
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_CipherValue=NULL;
- m_CipherReference=NULL;
- m_children.push_back(NULL);
- m_children.push_back(NULL);
+ m_CipherValue=nullptr;
+ m_CipherReference=nullptr;
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
m_pos_CipherValue=m_children.begin();
m_pos_CipherReference=m_pos_CipherValue;
++m_pos_CipherReference;
}
+
public:
virtual ~CipherDataImpl() {}
- CipherDataImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ CipherDataImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
init();
}
CipherDataImpl(const CipherDataImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
init();
- if (src.getCipherValue())
- setCipherValue(src.getCipherValue()->cloneCipherValue());
- if (src.getCipherReference())
- setCipherReference(src.getCipherReference()->cloneCipherReference());
+ IMPL_CLONE_TYPED_CHILD(CipherValue);
+ IMPL_CLONE_TYPED_CHILD(CipherReference);
}
IMPL_XMLOBJECT_CLONE(CipherData);
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_Id=m_Target=NULL;
+ m_Id=m_Target=nullptr;
}
+
public:
virtual ~EncryptionPropertyImpl() {
XMLString::release(&m_Id);
XMLString::release(&m_Target);
}
- EncryptionPropertyImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ EncryptionPropertyImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
init();
}
AbstractComplexElement(src),
AbstractDOMCachingXMLObject(src) {
init();
- setId(src.getId());
- setTarget(src.getTarget());
- VectorOf(XMLObject) v=getUnknownXMLObjects();
- for (vector<XMLObject*>::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i)
- v.push_back((*i)->clone());
+ IMPL_CLONE_ATTRIB(Id);
+ IMPL_CLONE_ATTRIB(Target);
+ IMPL_CLONE_XMLOBJECT_CHILDREN(UnknownXMLObject);
}
IMPL_XMLOBJECT_CLONE(EncryptionProperty);
- IMPL_ID_ATTRIB(Id);
+ IMPL_ID_ATTRIB_EX(Id,ID,nullptr);
IMPL_STRING_ATTRIB(Target);
IMPL_XMLOBJECT_CHILDREN(UnknownXMLObject, m_children.end());
- void setAttribute(QName& qualifiedName, const XMLCh* value) {
+ void setAttribute(const xmltooling::QName& qualifiedName, const XMLCh* value, bool ID=false) {
if (!qualifiedName.hasNamespaceURI()) {
if (XMLString::equals(qualifiedName.getLocalPart(),ID_ATTRIB_NAME)) {
setId(value);
return;
}
}
- AbstractAttributeExtensibleXMLObject::setAttribute(qualifiedName, value);
+ AbstractAttributeExtensibleXMLObject::setAttribute(qualifiedName, value, ID);
}
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_ID_ATTRIB(Id,ID,NULL);
- MARSHALL_STRING_ATTRIB(Target,TARGET,NULL);
+ MARSHALL_ID_ATTRIB(Id,ID,nullptr);
+ MARSHALL_STRING_ATTRIB(Target,TARGET,nullptr);
marshallExtensionAttributes(domElement);
}
}
void processAttribute(const DOMAttr* attribute) {
- PROC_ID_ATTRIB(Id,ID,NULL);
+ PROC_ID_ATTRIB(Id,ID,nullptr);
unmarshallExtensionAttribute(attribute);
}
};
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_Id=NULL;
+ m_Id=nullptr;
}
+
public:
virtual ~EncryptionPropertiesImpl() {
XMLString::release(&m_Id);
}
- EncryptionPropertiesImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ EncryptionPropertiesImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
init();
}
EncryptionPropertiesImpl(const EncryptionPropertiesImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
init();
- setId(src.getId());
- VectorOf(EncryptionProperty) v=getEncryptionPropertys();
- for (vector<EncryptionProperty*>::const_iterator i=src.m_EncryptionPropertys.begin(); i!=src.m_EncryptionPropertys.end(); i++) {
- if (*i) {
- v.push_back((*i)->cloneEncryptionProperty());
- }
- }
+ IMPL_CLONE_ATTRIB(Id);
+ IMPL_CLONE_TYPED_CHILDREN(EncryptionProperty);
}
IMPL_XMLOBJECT_CLONE(EncryptionProperties);
- IMPL_ID_ATTRIB(Id);
+ IMPL_ID_ATTRIB_EX(Id,ID,nullptr);
IMPL_TYPED_CHILDREN(EncryptionProperty,m_children.end());
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_ID_ATTRIB(Id,ID,NULL);
+ MARSHALL_ID_ATTRIB(Id,ID,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
}
void processAttribute(const DOMAttr* attribute) {
- PROC_ID_ATTRIB(Id,ID,NULL);
+ PROC_ID_ATTRIB(Id,ID,nullptr);
AbstractXMLObjectUnmarshaller::processAttribute(attribute);
}
};
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
- void init() {
- m_URI=NULL;
- }
-
protected:
ReferenceTypeImpl() {
- init();
+ m_URI=nullptr;
}
public:
XMLString::release(&m_URI);
}
- ReferenceTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
- : AbstractXMLObject(nsURI, localName, prefix, schemaType) {
- init();
+ ReferenceTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
+ : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_URI(nullptr) {
}
ReferenceTypeImpl(const ReferenceTypeImpl& src)
- : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
- init();
- setURI(src.getURI());
- VectorOf(XMLObject) v=getUnknownXMLObjects();
- for (vector<XMLObject*>::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i)
- v.push_back((*i)->clone());
+ : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src), m_URI(nullptr) {
+ }
+
+ void _clone(const ReferenceTypeImpl& src) {
+ IMPL_CLONE_ATTRIB(URI);
+ IMPL_CLONE_XMLOBJECT_CHILDREN(UnknownXMLObject);
}
- IMPL_XMLOBJECT_CLONE(ReferenceType);
+ IMPL_XMLOBJECT_CLONE_EX(ReferenceType);
IMPL_STRING_ATTRIB(URI);
IMPL_XMLOBJECT_CHILDREN(UnknownXMLObject,m_children.end());
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(URI,URI,NULL);
+ MARSHALL_STRING_ATTRIB(URI,URI,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(URI,URI,NULL);
+ PROC_STRING_ATTRIB(URI,URI,nullptr);
AbstractXMLObjectUnmarshaller::processAttribute(attribute);
}
};
public:
virtual ~DataReferenceImpl() {}
- DataReferenceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ DataReferenceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {}
DataReferenceImpl(const DataReferenceImpl& src) : AbstractXMLObject(src), ReferenceTypeImpl(src) {}
-
- IMPL_XMLOBJECT_CLONE(DataReference);
- ReferenceType* cloneReferenceType() const {
- return new DataReferenceImpl(*this);
- }
+
+ IMPL_XMLOBJECT_CLONE_EX(DataReference);
};
class XMLTOOL_DLLLOCAL KeyReferenceImpl : public virtual KeyReference, public ReferenceTypeImpl
public:
virtual ~KeyReferenceImpl() {}
- KeyReferenceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ KeyReferenceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {}
KeyReferenceImpl(const KeyReferenceImpl& src) : AbstractXMLObject(src), ReferenceTypeImpl(src) {}
- IMPL_XMLOBJECT_CLONE(KeyReference);
- ReferenceType* cloneReferenceType() const {
- return new KeyReferenceImpl(*this);
- }
+ IMPL_XMLOBJECT_CLONE_EX(KeyReference);
};
class XMLTOOL_DLLLOCAL ReferenceListImpl : public virtual ReferenceList,
public:
virtual ~ReferenceListImpl() {}
- ReferenceListImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ ReferenceListImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
}
ReferenceListImpl(const ReferenceListImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
- for (list<XMLObject*>::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) {
- if (*i) {
- DataReference* data=dynamic_cast<DataReference*>(*i);
- if (data) {
- getDataReferences().push_back(data->cloneDataReference());
- continue;
- }
-
- KeyReference* key=dynamic_cast<KeyReference*>(*i);
- if (key) {
- getKeyReferences().push_back(key->cloneKeyReference());
- continue;
- }
- }
- }
+ IMPL_CLONE_CHILDBAG_BEGIN;
+ IMPL_CLONE_TYPED_CHILD_IN_BAG(DataReference);
+ IMPL_CLONE_TYPED_CHILD_IN_BAG(KeyReference);
+ IMPL_CLONE_CHILDBAG_END;
}
IMPL_XMLOBJECT_CLONE(ReferenceList);
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_Id=m_Type=m_MimeType=m_Encoding=NULL;
- m_EncryptionMethod=NULL;
- m_KeyInfo=NULL;
- m_CipherData=NULL;
- m_EncryptionProperties=NULL;
- m_children.push_back(NULL);
- m_children.push_back(NULL);
- m_children.push_back(NULL);
- m_children.push_back(NULL);
+ m_Id=m_Type=m_MimeType=m_Encoding=nullptr;
+ m_EncryptionMethod=nullptr;
+ m_KeyInfo=nullptr;
+ m_CipherData=nullptr;
+ m_EncryptionProperties=nullptr;
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
m_pos_EncryptionMethod=m_children.begin();
m_pos_KeyInfo=m_pos_EncryptionMethod;
++m_pos_KeyInfo;
m_pos_EncryptionProperties=m_pos_CipherData;
++m_pos_EncryptionProperties;
}
+
protected:
EncryptedTypeImpl() {
init();
XMLString::release(&m_Encoding);
}
- EncryptedTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ EncryptedTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
init();
}
EncryptedTypeImpl(const EncryptedTypeImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
init();
- setId(src.getId());
- setType(src.getType());
- setMimeType(src.getMimeType());
- setEncoding(src.getEncoding());
- if (src.getEncryptionMethod())
- setEncryptionMethod(src.getEncryptionMethod()->cloneEncryptionMethod());
- if (src.getKeyInfo())
- setKeyInfo(src.getKeyInfo()->cloneKeyInfo());
- if (src.getCipherData())
- setCipherData(src.getCipherData()->cloneCipherData());
- if (src.getEncryptionProperties())
- setEncryptionProperties(src.getEncryptionProperties()->cloneEncryptionProperties());
+ }
+
+ void _clone(const EncryptedTypeImpl& src) {
+ IMPL_CLONE_ATTRIB(Id);
+ IMPL_CLONE_ATTRIB(Type);
+ IMPL_CLONE_ATTRIB(MimeType);
+ IMPL_CLONE_ATTRIB(Encoding);
+ IMPL_CLONE_TYPED_CHILD(EncryptionMethod);
+ IMPL_CLONE_TYPED_CHILD(KeyInfo);
+ IMPL_CLONE_TYPED_CHILD(CipherData);
+ IMPL_CLONE_TYPED_CHILD(EncryptionProperties);
}
- IMPL_XMLOBJECT_CLONE(EncryptedType);
- IMPL_ID_ATTRIB(Id);
+ IMPL_XMLOBJECT_CLONE_EX(EncryptedType);
+ IMPL_ID_ATTRIB_EX(Id,ID,nullptr);
IMPL_STRING_ATTRIB(Type);
IMPL_STRING_ATTRIB(MimeType);
IMPL_STRING_ATTRIB(Encoding);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_ID_ATTRIB(Id,ID,NULL);
- MARSHALL_STRING_ATTRIB(Type,TYPE,NULL);
- MARSHALL_STRING_ATTRIB(MimeType,MIMETYPE,NULL);
- MARSHALL_STRING_ATTRIB(Encoding,ENCODING,NULL);
+ MARSHALL_ID_ATTRIB(Id,ID,nullptr);
+ MARSHALL_STRING_ATTRIB(Type,TYPE,nullptr);
+ MARSHALL_STRING_ATTRIB(MimeType,MIMETYPE,nullptr);
+ MARSHALL_STRING_ATTRIB(Encoding,ENCODING,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
}
void processAttribute(const DOMAttr* attribute) {
- PROC_ID_ATTRIB(Id,ID,NULL);
- PROC_STRING_ATTRIB(Type,TYPE,NULL);
- PROC_STRING_ATTRIB(MimeType,MIMETYPE,NULL);
- PROC_STRING_ATTRIB(Encoding,ENCODING,NULL);
+ PROC_ID_ATTRIB(Id,ID,nullptr);
+ PROC_STRING_ATTRIB(Type,TYPE,nullptr);
+ PROC_STRING_ATTRIB(MimeType,MIMETYPE,nullptr);
+ PROC_STRING_ATTRIB(Encoding,ENCODING,nullptr);
AbstractXMLObjectUnmarshaller::processAttribute(attribute);
}
};
public:
virtual ~EncryptedDataImpl() {}
- EncryptedDataImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ EncryptedDataImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {}
EncryptedDataImpl(const EncryptedDataImpl& src) : AbstractXMLObject(src), EncryptedTypeImpl(src) {}
- IMPL_XMLOBJECT_CLONE(EncryptedData);
- EncryptedType* cloneEncryptedType() const {
- return new EncryptedDataImpl(*this);
- }
+ IMPL_XMLOBJECT_CLONE_EX(EncryptedData);
};
class XMLTOOL_DLLLOCAL EncryptedKeyImpl : public virtual EncryptedKey, public EncryptedTypeImpl
{
void init() {
- m_Recipient=NULL;
- m_ReferenceList=NULL;
- m_CarriedKeyName=NULL;
- m_children.push_back(NULL);
- m_children.push_back(NULL);
+ m_Recipient=nullptr;
+ m_ReferenceList=nullptr;
+ m_CarriedKeyName=nullptr;
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
m_pos_ReferenceList=m_pos_EncryptionProperties;
++m_pos_ReferenceList;
m_pos_CarriedKeyName=m_pos_ReferenceList;
XMLString::release(&m_Recipient);
}
- EncryptedKeyImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
+ EncryptedKeyImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
init();
}
init();
}
- IMPL_XMLOBJECT_CLONE(EncryptedKey);
- EncryptedType* cloneEncryptedType() const {
- return new EncryptedKeyImpl(*this);
+ void _clone(const EncryptedKeyImpl& src) {
+ EncryptedTypeImpl::_clone(src);
+ IMPL_CLONE_ATTRIB(Recipient);
+ IMPL_CLONE_TYPED_CHILD(ReferenceList);
+ IMPL_CLONE_TYPED_CHILD(CarriedKeyName);
}
+
+ IMPL_XMLOBJECT_CLONE_EX(EncryptedKey);
IMPL_STRING_ATTRIB(Recipient);
IMPL_TYPED_CHILD(ReferenceList);
IMPL_TYPED_CHILD(CarriedKeyName);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(Recipient,RECIPIENT,NULL);
+ MARSHALL_STRING_ATTRIB(Recipient,RECIPIENT,nullptr);
EncryptedTypeImpl::marshallAttributes(domElement);
}
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(Recipient,RECIPIENT,NULL);
+ PROC_STRING_ATTRIB(Recipient,RECIPIENT,nullptr);
EncryptedTypeImpl::processAttribute(attribute);
}
};
projects / shibboleth / cpp-xmltooling.git / blobdiff