mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More EncapsulatedX509Certificate work

Browse Source 
Change-Id: I64239dfcfbc2383c2bf53c0cb86196d3f2c79330
This commit is contained in:
Tor Lillqvist 2016-11-11 17:07:31 +02:00
parent a2c6112a47
commit abe9f41277
7 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xmlsecurity/inc/xmlsignaturehelper.hxx
View File

@ -159,6 +159,8 @@ public:
void SetX509Certificate(sal_Int32 nSecurityId, const OUString& ouX509IssuerName,
const OUString& ouX509SerialNumber, const OUString& ouX509Cert, const OUString& ouX509CertDigest);
void AddEncapsulatedX509Certificate(const OUString& ouEncapsulatedX509Certificate);
void SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const tools::Time& rTime );
void SetDescription(sal_Int32 nSecurityId, const OUString& rDescription);

10
xmlsecurity/source/helper/documentsignaturemanager.cxx
View File

@ -279,6 +279,16 @@ bool DocumentSignatureManager::add(const uno::Reference<security::XCertificate>&
maSignatureHelper.SetX509Certificate(nSecurityId, xCert->getIssuerName(), aCertSerial, aStrBuffer.makeStringAndClear(), aCertDigest);
uno::Sequence< uno::Reference< security::XCertificate > > aCertPath = getSecurityEnvironment()->buildCertificatePath( xCert );
const uno::Reference< security::XCertificate >* pCertPath = aCertPath.getConstArray();
sal_Int32 nCnt = aCertPath.getLength();
for (int i = 0; i < nCnt; i++)
{
sax::Converter::encodeBase64(aStrBuffer, pCertPath[i]->getEncoded());
maSignatureHelper.AddEncapsulatedX509Certificate(aStrBuffer.makeStringAndClear());
}
std::vector< OUString > aElements = DocumentSignatureHelper::CreateElementList(mxStore, meSignatureMode, DocumentSignatureAlgorithm::OOo3_2);
DocumentSignatureHelper::AppendContentTypes(mxStore, aElements);

5
xmlsecurity/source/helper/xmlsignaturehelper.cxx
View File

@ -120,6 +120,11 @@ void XMLSignatureHelper::SetX509Certificate(
ouX509CertDigest);
}
void XMLSignatureHelper::AddEncapsulatedX509Certificate(const OUString& ouEncapsulatedX509Certificate)
{
mpXSecController->addEncapsulatedX509Certificate(ouEncapsulatedX509Certificate);
}
void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const ::Date& rDate, const tools::Time& rTime )
{
css::util::DateTime stDateTime = ::DateTime(rDate, rTime).GetUNODateTime();

9
xmlsecurity/source/helper/xsecctl.cxx
View File

@ -584,9 +584,12 @@ void writeUnsignedProperties(
xDocumentHandler->startElement("xd:CertificateValues", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
{
xDocumentHandler->startElement("xd:EncapsulatedX509Certificate", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
xDocumentHandler->characters(signatureInfo.ouX509Certificate);
xDocumentHandler->endElement("xd:EncapsulatedX509Certificate");
for (const auto& i: signatureInfo.maEncapsulatedX509Certificates)
{
xDocumentHandler->startElement("xd:EncapsulatedX509Certificate", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
xDocumentHandler->characters(i);
xDocumentHandler->endElement("xd:EncapsulatedX509Certificate");
}
}
xDocumentHandler->endElement("xd:CertificateValues");

3
xmlsecurity/source/helper/xsecctl.hxx
View File

@ -314,7 +314,6 @@ private:
void setDate( OUString& ouDate );
void setDescription(const OUString& rDescription);
void setCertDigest(const OUString& rCertDigest);
void addEncapsulatedX509Certificate(const OUString& rEncapsulatedX509Certificate);
public:
void setSignatureBytes(const css::uno::Sequence<sal_Int8>& rBytes);
@ -385,6 +384,8 @@ public:
const OUString& ouX509Cert,
const OUString& ouX509CertDigest);
void addEncapsulatedX509Certificate(const OUString& rEncapsulatedX509Certificate);
void setDate(
sal_Int32 nSecurityId,
const css::util::DateTime& rDateTime );

2
xmlsecurity/source/helper/xsecparser.cxx
View File

@ -286,7 +286,7 @@ void SAL_CALL XSecParser::endElement( const OUString& aName )
else if (aName == "xd:CertDigest")
{
m_pXSecController->setCertDigest( m_ouCertDigest );
m_bInX509Certificate = false;
m_bInCertDigest = false;
}
else if (aName == "xd:EncapsulatedX509Certificate" || aName == "xades:EncapsulatedX509Certificate")
{

3
xmlsecurity/source/helper/xsecverify.cxx
View File

@ -299,6 +299,9 @@ void XSecController::addEncapsulatedX509Certificate(const OUString& rEncapsulate
if (m_vInternalSignatureInformations.empty())
return;
if (rEncapsulatedX509Certificate.isEmpty())
return;
InternalSignatureInformation& rInformation = m_vInternalSignatureInformations.back();
rInformation.signatureInfor.maEncapsulatedX509Certificates.insert(rEncapsulatedX509Certificate);
}