diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 79bdad2b2ddf..5543ef023bcc 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -6036,8 +6036,25 @@ typedef struct { Extension *extensions; } TimeStampReq; +/** + * Supplies different fields that are used to identify certificates, defined by + * RFC 5035. + */ +struct ESSCertIDv2 +{ +}; + +/** + * This attribute uses the ESSCertIDv2 structure, defined by RFC 5035. + */ struct SigningCertificateV2 { + ESSCertIDv2** certs; + + SigningCertificateV2() + : certs(nullptr) + { + } }; // (Partial) ASN.1 for the time stamp response. Very complicated. Pulled @@ -6255,6 +6272,16 @@ const SEC_ASN1Template TimeStampReq_Template[] = { 0, 0, nullptr, 0 } }; +/** + * ESSCertIDv2 ::= SEQUENCE { + * } + */ +const SEC_ASN1Template ESSCertIDv2Template[] = +{ + {SEC_ASN1_SEQUENCE, 0, nullptr, sizeof(ESSCertIDv2)}, + {0, 0, nullptr, 0} +}; + /** * SigningCertificateV2 ::= SEQUENCE { * } @@ -6262,6 +6289,7 @@ const SEC_ASN1Template TimeStampReq_Template[] = const SEC_ASN1Template SigningCertificateV2Template[] = { {SEC_ASN1_SEQUENCE, 0, nullptr, sizeof(SigningCertificateV2)}, + {SEC_ASN1_SEQUENCE_OF, offsetof(SigningCertificateV2, certs), ESSCertIDv2Template, 0}, {0, 0, nullptr, 0} }; @@ -7055,7 +7083,12 @@ bool PDFWriter::Sign(PDFSignContext& rContext) } // Add the signing certificate as a signed attribute. + ESSCertIDv2* aCertIDs[2]; + ESSCertIDv2 aCertID; + aCertIDs[0] = &aCertID; + aCertIDs[1] = nullptr; SigningCertificateV2 aCertificate; + aCertificate.certs = &aCertIDs[0]; SECItem* pEncodedCertificate = SEC_ASN1EncodeItem(nullptr, nullptr, &aCertificate, SigningCertificateV2Template); if (!pEncodedCertificate) {