diff options
77 files changed, 235 insertions, 385 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 631afd239994..0a1a717f2c62 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -252,11 +252,6 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFi mnInterfacePageId = AddTabPage("userinterface", ImpPDFTabViewerPage::Create, 0); mnViewPageId = AddTabPage("initialview", ImpPDFTabOpnFtrPage::Create, 0); -//remove tabpage if experimentalmode is not set - SvtMiscOptions aMiscOptions; - if (!aMiscOptions.IsExperimentalMode()) - RemoveTabPage(mnSigningPageId); - //last queued is the first to be displayed (or so it seems..) mnGeneralPageId = AddTabPage("general", ImpPDFTabGeneralPage::Create, 0 ); @@ -323,11 +318,7 @@ ImpPDFTabDialog::~ImpPDFTabDialog() RemoveTabPage(mnViewPageId); RemoveTabPage(mnLinksPage); RemoveTabPage(mnSecurityPageId); - -//remove tabpage if experimentalmode is set - SvtMiscOptions aMiscOptions; - if (aMiscOptions.IsExperimentalMode()) - RemoveTabPage(mnSigningPageId); + RemoveTabPage(mnSigningPageId); } // ----------------------------------------------------------------------------- @@ -1495,6 +1486,13 @@ ImplErrorDialog::ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& r maErrors.SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED ) ) ); } break; + case vcl::PDFWriter::Error_Signature_Failed: + { + sal_uInt16 nPos = maErrors.InsertEntry( OUString( PDFFilterResId( STR_ERR_SIGNATURE_FAILED ) ), + aErrImg ); + maErrors.SetEntryData( nPos, new OUString( PDFFilterResId( STR_ERR_PDF_EXPORT_ABORTED ) ) ); + } + break; default: break; } diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc index 0351742f668e..eae2466561ba 100644 --- a/filter/source/pdf/impdialog.hrc +++ b/filter/source/pdf/impdialog.hrc @@ -19,6 +19,9 @@ #include <filter.hrc> +#define STR_ERR_SIGNATURE_FAILED (RID_PDF_DIALOG_START + 0) +#define STR_ERR_PDF_EXPORT_ABORTED (RID_PDF_DIALOG_START + 1) + #define RID_PDF_WARNPDFAPASSWORD (RID_PDF_DIALOG_START + 6) //strings for PDF security, user password management diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src index ca9c21b2b9e2..7cc72f87b59a 100644 --- a/filter/source/pdf/impdialog.src +++ b/filter/source/pdf/impdialog.src @@ -97,6 +97,16 @@ ModalDialog RID_PDF_ERROR_DLG { Text [en-US] = "Transparencies removed"; }; + String STR_ERR_SIGNATURE_FAILED + { + Text [en-US] = "Signature generation failed"; + }; + + String STR_ERR_PDF_EXPORT_ABORTED + { + Text [en-US] = "PDF export aborted"; + }; + }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 7588b2c303d7..1d536df5e1dc 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -909,7 +909,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue if( bRet ) { pPDFExtOutDevData->PlayGlobalActions( *pPDFWriter ); - pPDFWriter->Emit(); + bRet = pPDFWriter->Emit(); aErrors = pPDFWriter->GetErrors(); } pOut->SetExtOutDevData( NULL ); diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 07d0f47827c1..4f99fd1657d3 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -216,7 +216,10 @@ public: // transparent objects were converted to a bitmap in order // to removetransparencies from the output - Warning_Transparency_Converted + Warning_Transparency_Converted, + + // signature generation failed + Error_Signature_Failed, }; struct VCL_DLLPUBLIC AnyWidget diff --git a/offapi/com/sun/star/security/CertificateCharacters.idl b/offapi/com/sun/star/security/CertificateCharacters.idl index 232d6b5173dc..479547bee090 100644 --- a/offapi/com/sun/star/security/CertificateCharacters.idl +++ b/offapi/com/sun/star/security/CertificateCharacters.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xml security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_CertificateCharacters_idl_ #define __com_sun_star_security_CertificateCharacters_idl_ diff --git a/offapi/com/sun/star/security/CertificateException.idl b/offapi/com/sun/star/security/CertificateException.idl index c755a8759e78..8be0a0daf46f 100644 --- a/offapi/com/sun/star/security/CertificateException.idl +++ b/offapi/com/sun/star/security/CertificateException.idl @@ -17,16 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xml security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_CertificateException_idl__ #define __com_sun_star_security_CertificateException_idl__ #include <com/sun/star/uno/SecurityException.idl> - module com { module sun { module star { module security { diff --git a/offapi/com/sun/star/security/CertificateValidity.idl b/offapi/com/sun/star/security/CertificateValidity.idl index e15b8e57c0d7..c387b1828791 100644 --- a/offapi/com/sun/star/security/CertificateValidity.idl +++ b/offapi/com/sun/star/security/CertificateValidity.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xml security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_CertificateValidity_idl_ #define __com_sun_star_security_CertificateValidity_idl_ diff --git a/offapi/com/sun/star/security/CryptographyException.idl b/offapi/com/sun/star/security/CryptographyException.idl index 7527916f554d..b5bcf55f9ab0 100644 --- a/offapi/com/sun/star/security/CryptographyException.idl +++ b/offapi/com/sun/star/security/CryptographyException.idl @@ -17,17 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ #ifndef __com_sun_star_security_CryptographyException_idl__ #define __com_sun_star_security_CryptographyException_idl__ #include <com/sun/star/uno/SecurityException.idl> - - module com { module sun { module star { module security { diff --git a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl index 2a1b0579b575..6b4a8bcb7e92 100644 --- a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl +++ b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - #ifndef __com_sun_star_security_documentdigitalsignatures_idl_ #define __com_sun_star_security_documentdigitalsignatures_idl_ @@ -53,7 +51,6 @@ service DocumentDigitalSignatures : XDocumentDigitalSignatures } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/security/EncryptionException.idl b/offapi/com/sun/star/security/EncryptionException.idl index 62fbdb16152f..54fab6530ebf 100644 --- a/offapi/com/sun/star/security/EncryptionException.idl +++ b/offapi/com/sun/star/security/EncryptionException.idl @@ -17,17 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ #ifndef __com_sun_star_security_EncryptionException_idl__ #define __com_sun_star_security_EncryptionException_idl__ #include <com/sun/star/security/CryptographyException.idl> - - module com { module sun { module star { module security { diff --git a/offapi/com/sun/star/security/ExtAltNameType.idl b/offapi/com/sun/star/security/ExtAltNameType.idl index a5809a01fff3..849529b73f38 100644 --- a/offapi/com/sun/star/security/ExtAltNameType.idl +++ b/offapi/com/sun/star/security/ExtAltNameType.idl @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_ExtAltNameType_idl_ #define __com_sun_star_security_ExtAltNameType_idl_ diff --git a/offapi/com/sun/star/security/KeyException.idl b/offapi/com/sun/star/security/KeyException.idl index c045dd8bd7e8..52ac23b7df6d 100644 --- a/offapi/com/sun/star/security/KeyException.idl +++ b/offapi/com/sun/star/security/KeyException.idl @@ -17,17 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ #ifndef __com_sun_star_security_KeyException_idl__ #define __com_sun_star_security_KeyException_idl__ #include <com/sun/star/uno/SecurityException.idl> - - module com { module sun { module star { module security { diff --git a/offapi/com/sun/star/security/NoPasswordException.idl b/offapi/com/sun/star/security/NoPasswordException.idl index d1d30a050f48..497bd8f05ec0 100644 --- a/offapi/com/sun/star/security/NoPasswordException.idl +++ b/offapi/com/sun/star/security/NoPasswordException.idl @@ -17,25 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ #ifndef __com_sun_star_security_NoPasswordException_idl__ #define __com_sun_star_security_NoPasswordException_idl__ #include <com/sun/star/uno/SecurityException.idl> - - module com { module sun { module star { module security { - exception NoPasswordException : com::sun::star::uno::SecurityException { }; - }; }; }; }; #endif diff --git a/offapi/com/sun/star/security/SignatureException.idl b/offapi/com/sun/star/security/SignatureException.idl index 8d6f9f0cc522..d5353b705468 100644 --- a/offapi/com/sun/star/security/SignatureException.idl +++ b/offapi/com/sun/star/security/SignatureException.idl @@ -17,25 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_SignatureException_idl__ #define __com_sun_star_security_SignatureException_idl__ #include <com/sun/star/security/CryptographyException.idl> - - module com { module sun { module star { module security { - exception SignatureException : com::sun::star::security::CryptographyException { }; - }; }; }; }; #endif diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl index 822189357cbc..cc785b988390 100644 --- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl +++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_XDocumentDigitalSignatures_idl_ #define __com_sun_star_security_XDocumentDigitalSignatures_idl_ @@ -144,5 +140,4 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/security/XSanExtension.idl b/offapi/com/sun/star/security/XSanExtension.idl index 9ebde2817665..fbfbee31c7be 100644 --- a/offapi/com/sun/star/security/XSanExtension.idl +++ b/offapi/com/sun/star/security/XSanExtension.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_XSanExtension_idl_ #define __com_sun_star_security_XSanExtension_idl_ diff --git a/offapi/com/sun/star/security/XSerialNumberAdapter.idl b/offapi/com/sun/star/security/XSerialNumberAdapter.idl index 9d125eaab7e0..07356bcbe126 100644 --- a/offapi/com/sun/star/security/XSerialNumberAdapter.idl +++ b/offapi/com/sun/star/security/XSerialNumberAdapter.idl @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_XSerialNumberAdapter_idl_ #define __com_sun_star_security_XSerialNumberAdapter_idl_ diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl index b73e838ac192..1c18e4b0aafb 100644 --- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl +++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_SecurityEnvironment_idl_ #define __com_sun_star_xml_crypto_SecurityEnvironment_idl_ @@ -35,7 +31,6 @@ service SecurityEnvironment : XSecurityEnvironment; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl index 06263eafd0cb..764886afc04c 100644 --- a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl +++ b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_securityoperationstatus_idl_ #define __com_sun_star_xml_crypto_securityoperationstatus_idl_ @@ -137,7 +133,6 @@ enum SecurityOperationStatus } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl index 2fae78e840cd..485d27f493e4 100644 --- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl +++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xmlencryption_idl_ #define __com_sun_star_xml_crypto_xmlencryption_idl_ diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl index 5095e805cafd..eed651c01b66 100644 --- a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl +++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl @@ -17,25 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_XMLEncryptionException_idl__ #define __com_sun_star_xml_crypto_XMLEncryptionException_idl__ #include <com/sun/star/security/EncryptionException.idl> - - module com { module sun { module star { module xml { module crypto { - exception XMLEncryptionException : com::sun::star::security::EncryptionException { }; - }; }; }; }; }; #endif diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl index 67b5605e3118..347be1cce735 100644 --- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl +++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xmlencryptiontemplate_idl_ #define __com_sun_star_xml_crypto_xmlencryptiontemplate_idl_ @@ -33,7 +29,6 @@ module com { module sun { module star { module xml { module crypto { */ service XMLEncryptionTemplate : com::sun::star::xml::crypto::XXMLEncryptionTemplate; - } ; } ; } ; } ; } ; #endif diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl index 1d841970ecb7..46fce6231b41 100644 --- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl +++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_XMLSecurityContext_idl_ #define __com_sun_star_xml_crypto_XMLSecurityContext_idl_ @@ -35,7 +31,6 @@ service XMLSecurityContext : XXMLSecurityContext; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl index f19d9619e8a9..2596bd35148e 100644 --- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl +++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xmlsignature_idl_ #define __com_sun_star_xml_crypto_xmlsignature_idl_ @@ -41,7 +37,6 @@ service XMLSignature { } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl index 5ca35381b356..70949f68eb27 100644 --- a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl +++ b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl @@ -17,25 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_XMLSignatureException_idl__ #define __com_sun_star_xml_crypto_XMLSignatureException_idl__ #include <com/sun/star/security/SignatureException.idl> - - module com { module sun { module star { module xml { module crypto { - exception XMLSignatureException : com::sun::star::security::SignatureException { }; - }; }; }; }; }; #endif diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl index 6789af9a3592..f966baba0694 100644 --- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl +++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xmlsignaturetemplate_idl_ #define __com_sun_star_xml_crypto_xmlsignaturetemplate_idl_ @@ -35,7 +31,6 @@ service XMLSignatureTemplate : com::sun::star::xml::crypto::XXMLSignatureTemplat } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XUriBinding.idl b/offapi/com/sun/star/xml/crypto/XUriBinding.idl index f0e42176601b..0bffbca9497e 100644 --- a/offapi/com/sun/star/xml/crypto/XUriBinding.idl +++ b/offapi/com/sun/star/xml/crypto/XUriBinding.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xuribinding_idl_ #define __com_sun_star_xml_crypto_xuribinding_idl_ @@ -60,7 +56,6 @@ interface XUriBinding : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl index fcf8fcb07ef0..20fd5e74deb7 100644 --- a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl +++ b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xxmlencryption_idl_ #define __com_sun_star_xml_crypto_xxmlencryption_idl_ @@ -72,7 +68,6 @@ interface XXMLEncryption : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl index 22917435e026..b19eac3504be 100644 --- a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl +++ b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xxmlencryptiontemplate_idl_ #define __com_sun_star_xml_crypto_xxmlencryptiontemplate_idl_ @@ -80,10 +76,8 @@ interface XXMLEncryptionTemplate : XXMLSecurityTemplate ) ; } ; - } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl index e3b676bfbd1e..c29f2440bb4f 100644 --- a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl +++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xxmlsecuritytemplate_idl_ #define __com_sun_star_xml_crypto_xxmlsecuritytemplate_idl_ @@ -75,7 +71,6 @@ interface XXMLSecurityTemplate : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl index c1a7534ec6f0..b0db29018b83 100644 --- a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl +++ b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xxmlsignature_idl_ #define __com_sun_star_xml_crypto_xxmlsignature_idl_ diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl index 1748097536e3..844c240a04cf 100644 --- a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl +++ b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_xxmlsignaturetemplate_idl_ #define __com_sun_star_xml_crypto_xxmlsignaturetemplate_idl_ @@ -71,7 +67,6 @@ interface XXMLSignatureTemplate : XXMLSecurityTemplate } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl index 736ad5a33ff8..d550519ae775 100644 --- a/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl +++ b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_constofsecurityid_idl_ #define __com_sun_star_xml_crypto_sax_constofsecurityid_idl_ diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl index d34ff4b2b9f8..5b0dbe527e9b 100644 --- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl +++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_decryptor_idl_ #define __com_sun_star_xml_crypto_sax_decryptor_idl_ @@ -49,7 +45,6 @@ service Decryptor { } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl index 8c13371eee15..0a2de0f3e621 100644 --- a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl +++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ #ifndef __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_ #define __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_ @@ -51,7 +48,6 @@ enum ElementMarkPriority } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl index 9a1bb82aa328..6d0ac9e751fd 100644 --- a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl +++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_elementmarktype_idl_ #define __com_sun_star_xml_crypto_sax_elementmarktype_idl_ @@ -38,7 +34,6 @@ enum ElementMarkType ELEMENTCOLLECTOR }; - } ; } ; } ; } ; } ; } ; #endif diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl index 019d358340e6..a12368522686 100644 --- a/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl +++ b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_ElementStackItem_idl_ #define __com_sun_star_xml_crypto_sax_ElementStackItem_idl_ @@ -51,7 +47,6 @@ struct ElementStackItem } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl index bca86d3c1b08..40fcf5ffcf47 100644 --- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl +++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_encryptor_idl_ #define __com_sun_star_xml_crypto_sax_encryptor_idl_ @@ -51,7 +47,6 @@ service Encryptor { } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl index a713a2940b0b..cb0d96faf935 100644 --- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl +++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_saxeventkeeper_idl_ #define __com_sun_star_xml_crypto_sax_saxeventkeeper_idl_ @@ -47,7 +43,6 @@ service SAXEventKeeper { } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl index 5a43bae2cbe8..cc2c6f2ee353 100644 --- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl +++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl @@ -16,9 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - //i20156 - new file for XML security module - - /** -- idl definition -- **/ #ifndef __com_sun_star_xml_crypto_sax_signaturecreator_idl_ #define __com_sun_star_xml_crypto_sax_signaturecreator_idl_ diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl index eb67c5c8b426..aff2a68c49c4 100644 --- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl +++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_signatureverifier_idl_ #define __com_sun_star_xml_crypto_sax_signatureverifier_idl_ @@ -49,8 +45,7 @@ service SignatureVerifier { interface com::sun::star::lang::XInitialization ; }; - } ; } ; } ; } ; } ; } ; - +} ; } ; } ; } ; } ; } ; #endif diff --git a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl index 9bed52fc23df..35eace3f6ef2 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xblockermonitor_idl_ #define __com_sun_star_xml_crypto_sax_xblockermonitor_idl_ @@ -47,7 +43,6 @@ interface XBlockerMonitor : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl index a153787cdb86..21bf34a8f85f 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xdecryptionresultbroadcaster_idl_ #define __com_sun_star_xml_crypto_sax_xdecryptionresultbroadcaster_idl_ @@ -62,7 +58,6 @@ interface XDecryptionResultBroadcaster : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl index 6eb0527cfe18..93bf329138c6 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xdecryptionresultlistener_idl_ #define __com_sun_star_xml_crypto_sax_xdecryptionresultlistener_idl_ @@ -51,7 +47,6 @@ interface XDecryptionResultListener : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl index cafa90748724..12ccf90adc02 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xelementstackkeeper_idl_ #define __com_sun_star_xml_crypto_sax_xelementstackkeeper_idl_ @@ -61,7 +57,6 @@ interface XElementStackKeeper : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl index 022df5543a92..ac4390122f30 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xencryptionresultbroadcaster_idl_ #define __com_sun_star_xml_crypto_sax_xencryptionresultbroadcaster_idl_ @@ -62,7 +58,6 @@ interface XEncryptionResultBroadcaster : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl index 7b11fd3dbc32..38aeb9ca48b8 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module -/** -- idl definition -- **/ #ifndef __com_sun_star_xml_crypto_sax_xencryptionresultlistener_idl_ #define __com_sun_star_xml_crypto_sax_xencryptionresultlistener_idl_ diff --git a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl index 336656fd7d12..02f2dd10bf54 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xkeycollector_idl_ #define __com_sun_star_xml_crypto_sax_xkeycollector_idl_ @@ -48,7 +44,6 @@ interface XKeyCollector : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl index 1eef8a679355..60b9ce1aab64 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xmissiontaker_idl_ #define __com_sun_star_xml_crypto_sax_xmissiontaker_idl_ @@ -47,7 +43,6 @@ interface XMissionTaker : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl index 96bf98a6010b..48e5a0ba3fd6 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_XReferenceCollector_idl_ #define __com_sun_star_xml_crypto_sax_XReferenceCollector_idl_ @@ -57,7 +53,6 @@ interface XReferenceCollector : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl index 728077fc3e8c..1f4d95447b20 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xreferenceresolvedbroadcaster_idl_ #define __com_sun_star_xml_crypto_sax_xreferenceresolvedbroadcaster_idl_ @@ -69,7 +65,6 @@ interface XReferenceResolvedBroadcaster : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl index e1f3247b7064..776b229c4ddc 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xreferenceresolvedlistener_idl_ #define __com_sun_star_xml_crypto_sax_xreferenceresolvedlistener_idl_ @@ -48,7 +44,6 @@ interface XReferenceResolvedListener : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl index 501c2d0476e8..387f3341d49d 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsaxeventkeeper_idl_ #define __com_sun_star_xml_crypto_sax_xsaxeventkeeper_idl_ @@ -133,7 +129,6 @@ interface XSAXEventKeeper : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl index f7e12f9348b2..4a4ca15873fa 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsaxeventkeeperstatuschangebroadcaster_idl_ #define __com_sun_star_xml_crypto_sax_xsaxeventkeeperstatuschangebroadcaster_idl_ @@ -63,7 +59,6 @@ interface XSAXEventKeeperStatusChangeBroadcaster : com::sun::star::uno::XInterfa } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl index db86d560ef60..d214edc8a864 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsaxeventkeeperstatuschangelistener_idl_ #define __com_sun_star_xml_crypto_sax_xsaxeventkeeperstatuschangelistener_idl_ @@ -65,7 +61,6 @@ interface XSAXEventKeeperStatusChangeListener : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl index 1c7660eeab2b..c0b892f22f3b 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_XSecurityController_idl_ #define __com_sun_star_xml_crypto_sax_XSecurityController_idl_ @@ -42,7 +38,6 @@ interface XSecurityController : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl index 855397d4e068..c408907e2b94 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsecuritysaxeventkeeper_idl_ #define __com_sun_star_xml_crypto_sax_xsecuritysaxeventkeeper_idl_ @@ -80,7 +76,6 @@ interface XSecuritySAXEventKeeper : XSAXEventKeeper } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl index 3f134d9597f9..2a1ed9f15fb0 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsignaturecreationresultbroadcaster_idl_ #define __com_sun_star_xml_crypto_sax_xsignaturecreationresultbroadcaster_idl_ @@ -63,7 +59,6 @@ interface XSignatureCreationResultBroadcaster : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl index 3dd6e3641e34..c7f958a513f4 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xml security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsignaturecreationresultlistener_idl_ #define __com_sun_star_xml_crypto_sax_xsignaturecreationresultlistener_idl_ @@ -51,7 +47,6 @@ interface XSignatureCreationResultListener : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl index 8d7f37bd8300..20b64966dc8d 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xml security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsignatureverifyresultbroadcaster_idl_ #define __com_sun_star_xml_crypto_sax_xsignatureverifyresultbroadcaster_idl_ @@ -63,7 +59,6 @@ interface XSignatureVerifyResultBroadcaster : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl index faba39fc73fa..f1ea34f9f172 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xml security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_crypto_sax_xsignatureverifyresultlistener_idl_ #define __com_sun_star_xml_crypto_sax_xsignatureverifyresultlistener_idl_ @@ -51,7 +47,6 @@ interface XSignatureVerifyResultListener : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl index d397f27a4db4..7828465e61ce 100644 --- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl +++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - #ifndef __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__ #define __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__ @@ -26,7 +24,6 @@ #include <com/sun/star/xml/sax/SAXException.idl> #include <com/sun/star/xml/csax/XMLAttribute.idl> - module com { module sun { module star { module xml { module csax { /** diff --git a/offapi/com/sun/star/xml/csax/XMLAttribute.idl b/offapi/com/sun/star/xml/csax/XMLAttribute.idl index 4316113ec344..28e4125a2284 100644 --- a/offapi/com/sun/star/xml/csax/XMLAttribute.idl +++ b/offapi/com/sun/star/xml/csax/XMLAttribute.idl @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for xmlsecurity module - #ifndef __com_sun_star_xml_csax_XMLAttribute_idl__ #define __com_sun_star_xml_csax_XMLAttribute_idl__ diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl index 70a229d4f2a4..753403555371 100644 --- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl +++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_wrapper_xmldocumentwrapper_idl_ #define __com_sun_star_xml_wrapper_xmldocumentwrapper_idl_ @@ -41,7 +37,6 @@ service XMLDocumentWrapper { } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl index 20970a05b100..c48fd68dfe1b 100644 --- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl +++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_wrapper_xmlelementwrapper_idl_ #define __com_sun_star_xml_wrapper_xmlelementwrapper_idl_ @@ -43,7 +39,6 @@ service XMLElementWrapper { } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl index 3b740c57173b..6be5167f07d9 100644 --- a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl +++ b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_wrapper_xxmldocumentwrapper_idl_ #define __com_sun_star_xml_wrapper_xxmldocumentwrapper_idl_ @@ -163,7 +159,6 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl index 9ed754a94b47..658973cb2ae5 100644 --- a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl +++ b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//i20156 - new file for XML security module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_xml_wrapper_xxmlelementwrapper_idl_ #define __com_sun_star_xml_wrapper_xxmlelementwrapper_idl_ @@ -42,7 +38,6 @@ interface XXMLElementWrapper : com::sun::star::uno::XInterface } ; } ; } ; } ; } ; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 38cf55acd605..af701e92a743 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -57,7 +57,8 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\ $(eval $(call gb_Library_use_externals,vcl,\ jpeg \ - nss3 \ + $(if $(filter-out WNT,$(OS)), \ + nss3) \ libeot \ )) @@ -628,6 +629,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ advapi32 \ + crypt32 \ gdi32 \ gdiplus \ imm32 \ diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 8f6a7e9be048..c0791f60182f 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -75,8 +75,8 @@ #include <boost/scoped_array.hpp> -#if !defined(ANDROID) && !defined(IOS) -// NSS header files for PDF signing support +#if !defined(ANDROID) && !defined(IOS) && !defined(_WIN32) +// NSS headers for PDF signing #include "nss.h" #include "cert.h" #include "hasht.h" @@ -85,6 +85,13 @@ #include "cmst.h" #endif +#ifdef _WIN32 +// WinCrypt headers for PDF signing +#include <prewin.h> +#include <wincrypt.h> +#include <postwin.h> +#endif + #include <config_eot.h> #if ENABLE_EOT @@ -5946,6 +5953,8 @@ bool PDFWriterImpl::emitSignature() return true; } +#if !defined(ANDROID) && !defined(IOS) && !defined(_WIN32) + char *PDFSigningPKCS7PasswordCallback(PK11SlotInfo * /*slot*/, PRBool /*retry*/, void *arg) { return (char *)arg; @@ -5962,6 +5971,39 @@ namespace { }; } +#endif + +#ifdef _WIN32 + +namespace { + +OUString WindowsError(DWORD nErrorCode) +{ + LPWSTR pMsgBuf; + + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + nErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&pMsgBuf, + 0, + NULL) == 0) + return OUString::number(nErrorCode, 16); + + if (pMsgBuf[wcslen(pMsgBuf)-1] == '\n') + pMsgBuf[wcslen(pMsgBuf)-1] = '\0'; + + OUString result(pMsgBuf); + + LocalFree(pMsgBuf); + + return result; +} + +} + +#endif + bool PDFWriterImpl::finalizeSignature() { @@ -5996,25 +6038,23 @@ bool PDFWriterImpl::finalizeSignature() sal_Int8* n_derArray = derEncoded.getArray(); sal_Int32 n_derLength = derEncoded.getLength(); - NSS_NoDB_Init("."); +#ifndef _WIN32 CERTCertificate *cert = CERT_DecodeCertFromPackage(reinterpret_cast<char *>(n_derArray), n_derLength); if (!cert) { - SAL_WARN("vcl.gdi", "PDF Signing: Error occured, certificate cannot be reconstructed."); + SAL_WARN("vcl.pdfwriter", "PDF Signing: Error occured, certificate cannot be reconstructed."); return false; } - SAL_WARN("vcl.gdi", "PDF Signing: Certificate Subject: " << cert->subjectName << "\n\tCertificate Issuer: " << cert->issuerName); - // Prepare buffer and calculate PDF file digest CHECK_RETURN( (osl_File_E_None == osl_setFilePos( m_aFile, osl_Pos_Absolut, 0) ) ); HashContextScope hc(HASH_Create(HASH_AlgSHA1)); if (!hc.get()) { - SAL_WARN("vcl.gdi", "PDF Signing: SHA1 HASH_Create failed!"); + SAL_WARN("vcl.pdfwriter", "PDF Signing: SHA1 HASH_Create failed!"); return false; } @@ -6027,7 +6067,7 @@ bool PDFWriterImpl::finalizeSignature() CHECK_RETURN( (osl_File_E_None == osl_readFile( m_aFile, buffer.get(), m_nSignatureContentOffset - 1 , &bytesRead ) ) ); if (bytesRead != (sal_uInt64)m_nSignatureContentOffset - 1) - SAL_WARN("vcl.gdi", "PDF Signing: First buffer read failed!"); + SAL_WARN("vcl.pdfwriter", "PDF Signing: First buffer read failed!"); HASH_Update(hc.get(), reinterpret_cast<const unsigned char*>(buffer.get()), bytesRead); @@ -6035,7 +6075,7 @@ bool PDFWriterImpl::finalizeSignature() buffer.reset(new char[nLastByteRangeNo + 1]); CHECK_RETURN( (osl_File_E_None == osl_readFile( m_aFile, buffer.get(), nLastByteRangeNo, &bytesRead ) ) ); if (bytesRead != (sal_uInt64) nLastByteRangeNo) - SAL_WARN("vcl.gdi", "PDF Signing: Second buffer read failed!"); + SAL_WARN("vcl.pdfwriter", "PDF Signing: Second buffer read failed!"); HASH_Update(hc.get(), reinterpret_cast<const unsigned char*>(buffer.get()), bytesRead); @@ -6050,21 +6090,21 @@ bool PDFWriterImpl::finalizeSignature() NSSCMSMessage *cms_msg = NSS_CMSMessage_Create(NULL); if (!cms_msg) { - SAL_WARN("vcl.gdi", "PDF signing: can't create new CMS message."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't create new CMS message."); return false; } NSSCMSSignedData *cms_sd = NSS_CMSSignedData_Create(cms_msg); if (!cms_sd) { - SAL_WARN("vcl.gdi", "PDF signing: can't create CMS SignedData."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't create CMS SignedData."); return false; } NSSCMSContentInfo *cms_cinfo = NSS_CMSMessage_GetContentInfo(cms_msg); if (NSS_CMSContentInfo_SetContent_SignedData(cms_msg, cms_cinfo, cms_sd) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF signing: Can't set CMS content signed data."); + SAL_WARN("vcl.pdfwriter", "PDF signing: Can't set CMS content signed data."); return false; } @@ -6072,49 +6112,47 @@ bool PDFWriterImpl::finalizeSignature() //attach NULL data as detached data if (NSS_CMSContentInfo_SetContent_Data(cms_msg, cms_cinfo, NULL, PR_TRUE) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF signing: Can't set CMS content data."); + SAL_WARN("vcl.pdfwriter", "PDF signing: Can't set CMS content data."); return false; } NSSCMSSignerInfo *cms_signer = NSS_CMSSignerInfo_Create(cms_msg, cert, SEC_OID_SHA1); if (!cms_signer) { - SAL_WARN("vcl.gdi", "PDF signing: can't create CMS SignerInfo."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't create CMS SignerInfo."); return false; } if (NSS_CMSSignerInfo_IncludeCerts(cms_signer, NSSCMSCM_CertChain, certUsageEmailSigner) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF signing: can't include cert chain."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't include cert chain."); return false; } if (NSS_CMSSignerInfo_AddSigningTime(cms_signer, PR_Now()) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF signing: can't add signing time."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't add signing time."); return false; } if (NSS_CMSSignedData_AddCertificate(cms_sd, cert) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF signing: can't add signer certificate."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't add signer certificate."); return false; } if (NSS_CMSSignedData_AddSignerInfo(cms_sd, cms_signer) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF signing: can't add signer info."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't add signer info."); return false; } if (NSS_CMSSignedData_SetDigestValue(cms_sd, SEC_OID_SHA1, &digest) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF signing: can't set PDF digest value."); + SAL_WARN("vcl.pdfwriter", "PDF signing: can't set PDF digest value."); return false; } - SAL_WARN("vcl.gdi","PKCS7 Object created successfully!"); - SECItem cms_output; cms_output.data = 0; cms_output.len = 0; @@ -6126,25 +6164,21 @@ bool PDFWriterImpl::finalizeSignature() if (!cms_ecx) { - SAL_WARN("vcl.gdi", "PDF Signing: can't start DER encoder."); + SAL_WARN("vcl.pdfwriter", "PDF Signing: can't start DER encoder."); return false; } - SAL_WARN("vcl.gdi", "PDF Signing: Started DER encoding."); if (NSS_CMSEncoder_Finish(cms_ecx) != SECSuccess) { - SAL_WARN("vcl.gdi", "PDF Signing: can't finish DER encoder."); + SAL_WARN("vcl.pdfwriter", "PDF Signing: can't finish DER encoder."); return false; } - SAL_WARN("vcl.gdi", "PDF Signing: Finished DER encoding."); OStringBuffer cms_hexbuffer; for (unsigned int i = 0; i < cms_output.len ; i++) appendHex(cms_output.data[i], cms_hexbuffer); - SAL_WARN("vcl.gdi","PKCS7 object encoded successfully!"); - // Set file pointer to the m_nSignatureContentOffset, we're ready to overwrite PKCS7 object nWritten = 0; CHECK_RETURN( (osl_File_E_None == osl_setFilePos( m_aFile, osl_Pos_Absolut, m_nSignatureContentOffset) ) ); @@ -6154,6 +6188,104 @@ bool PDFWriterImpl::finalizeSignature() CHECK_RETURN( (osl_File_E_None == osl_setFilePos( m_aFile, osl_Pos_Absolut, nOffset ) ) ); return true; + +#else + + // Prepare buffer and calculate PDF file digest + CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) ); + + PCCERT_CONTEXT pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, reinterpret_cast<const BYTE*>(n_derArray), n_derLength); + if (pCertContext == NULL) + { + SAL_WARN("vcl.pdfwriter", "CertCreateCertificateContext failed: " << WindowsError(GetLastError())); + return false; + } + + boost::scoped_array<char> buffer1(new char[m_nSignatureContentOffset - 1]); + sal_uInt64 bytesRead1; + + if (osl::File::E_None != m_aFile.read(buffer1.get(), m_nSignatureContentOffset - 1 , bytesRead1) || + bytesRead1 != (sal_uInt64)m_nSignatureContentOffset - 1) + { + SAL_WARN("vcl.pdfwriter", "PDF Signing: First buffer read failed!"); + CertFreeCertificateContext(pCertContext); + return false; + } + + boost::scoped_array<char> buffer2(new char[nLastByteRangeNo]); + sal_uInt64 bytesRead2; + + if (osl::File::E_None != m_aFile.setPos(osl_Pos_Absolut, m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) || + osl::File::E_None != m_aFile.read(buffer2.get(), nLastByteRangeNo, bytesRead2) || + bytesRead2 != (sal_uInt64) nLastByteRangeNo) + { + SAL_WARN("vcl.pdfwriter", "PDF Signing: Second buffer read failed!"); + CertFreeCertificateContext(pCertContext); + return false; + } + + OString pass = OUStringToOString( m_aContext.SignPassword, RTL_TEXTENCODING_UTF8 ); + + CRYPT_SIGN_MESSAGE_PARA aPara; + + memset(&aPara, 0, sizeof(aPara)); + aPara.cbSize = sizeof(aPara); + aPara.dwMsgEncodingType = PKCS_7_ASN_ENCODING | X509_ASN_ENCODING; + aPara.pSigningCert = pCertContext; + aPara.HashAlgorithm.pszObjId = szOID_RSA_SHA1RSA; + aPara.HashAlgorithm.Parameters.cbData = 0; + aPara.cMsgCert = 1; + aPara.rgpMsgCert = &pCertContext; + + const BYTE *aBuffers[] = + { reinterpret_cast<BYTE*>(buffer1.get()), reinterpret_cast<BYTE*>(buffer2.get()) }; + DWORD aBufferLens[] = + { bytesRead1, bytesRead2 }; + assert(SAL_N_ELEMENTS(aBuffers) == SAL_N_ELEMENTS(aBufferLens)); + + DWORD nSigLen(0); + + if (!CryptSignMessage(&aPara, TRUE, SAL_N_ELEMENTS(aBuffers), aBuffers, aBufferLens, NULL, &nSigLen)) + { + SAL_WARN("vcl.pdfwriter", "CryptSignMessage failed: " << WindowsError(GetLastError())); + CertFreeCertificateContext(pCertContext); + return false; + } + + if (nSigLen*2 > MAX_SIGNATURE_CONTENT_LENGTH) + { + SAL_WARN("vcl.pdfwriter", "Signature requires more space (" << nSigLen*2 << ") than we reserved (" << MAX_SIGNATURE_CONTENT_LENGTH << ")"); + CertFreeCertificateContext(pCertContext); + return false; + } + + SAL_INFO("vcl.pdfwriter", "Signature size is " << nSigLen << " bytes"); + + boost::scoped_array<BYTE> pSig(new BYTE[nSigLen]); + if (!CryptSignMessage(&aPara, TRUE, SAL_N_ELEMENTS(aBuffers), aBuffers, aBufferLens, pSig.get(), &nSigLen)) + { + SAL_WARN("vcl.pdfwriter", "CryptSignMessage failed: " << WindowsError(GetLastError())); + CertFreeCertificateContext(pCertContext); + return false; + } + + // Release resources + CertFreeCertificateContext(pCertContext); + + OStringBuffer cms_hexbuffer; + + for (unsigned int i = 0; i < nSigLen ; i++) + appendHex(pSig[i], cms_hexbuffer); + + // Set file pointer to the m_nSignatureContentOffset, we're ready to overwrite PKCS7 object + nWritten = 0; + CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, m_nSignatureContentOffset)) ); + m_aFile.write(cms_hexbuffer.getStr(), cms_hexbuffer.getLength(), nWritten); + + CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, nOffset)) ); + + return true; +#endif } #endif @@ -6955,7 +7087,13 @@ bool PDFWriterImpl::emit() #if !defined(ANDROID) && !defined(IOS) if (m_nSignatureObject != -1) // if document is signed, emit sigdict - CHECK_RETURN( emitSignature() ); + { + if( !emitSignature() ) + { + m_aErrors.insert( PDFWriter::Error_Signature_Failed ); + return false; + } + } #endif // emit trailer @@ -6963,7 +7101,13 @@ bool PDFWriterImpl::emit() #if !defined(ANDROID) && !defined(IOS) if (m_nSignatureObject != -1) // finalize the signature - CHECK_RETURN( finalizeSignature() ); + { + if( !finalizeSignature() ) + { + m_aErrors.insert( PDFWriter::Error_Signature_Failed ); + return false; + } + } #endif osl_closeFile( m_aFile ); diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index b7660d9347c0..0ded8e251022 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -86,7 +86,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar args[1] = cssu::makeAny(m_xSAXEventKeeper); args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector)); - //i39448 : for nss, the internal module is used for signing, which needs to be improved later + //for nss, the internal module is used for signing, which needs to be improved later sal_Int32 nEnvIndex = internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex; if( nEnvIndex < 0 || nEnvIndex >= m_xSecurityContext->getSecurityEnvironmentNumber()) {// set defaultEnv diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 7b92f8606a85..1ee9831ab27e 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -148,7 +148,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt( setErrorRecorder( ); - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -157,7 +157,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt( pEncCtx = xmlSecEncCtxCreate( pMngr ) ; if( pEncCtx == NULL ) { - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); return aTemplate; @@ -167,13 +167,13 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt( if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 ) { aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN); xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); clearErrorRecorder(); return aTemplate; } aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED); xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //get the new EncryptedData element if (isParentRef) @@ -254,7 +254,7 @@ XMLEncryption_MSCryptImpl :: decrypt( setErrorRecorder( ); - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -263,7 +263,7 @@ XMLEncryption_MSCryptImpl :: decrypt( pEncCtx = xmlSecEncCtxCreate( pMngr ) ; if( pEncCtx == NULL ) { - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); return aTemplate; @@ -273,7 +273,7 @@ XMLEncryption_MSCryptImpl :: decrypt( if( xmlSecEncCtxDecrypt( pEncCtx , pEncryptedData ) < 0 || pEncCtx->result == NULL ) { aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN); xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); @@ -306,7 +306,7 @@ XMLEncryption_MSCryptImpl :: decrypt( //Destroy the encryption context xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //get the decrypted element XMLElementWrapper_XmlSecImpl * ret = new XMLElementWrapper_XmlSecImpl(isParentRef? diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index 53307a719213..dbe738bf1f68 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -63,7 +63,6 @@ XMLSecurityContext_MSCryptImpl :: ~XMLSecurityContext_MSCryptImpl() { xmlSecShutdown() ; } -//i39448 : new methods sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException) diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index 88f286191c2c..d7832764e868 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -106,7 +106,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: generate( setErrorRecorder( ); - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -116,7 +116,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: generate( if( pDsigCtx == NULL ) { //throw XMLSignatureException() ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); clearErrorRecorder(); return aTemplate; } @@ -136,7 +136,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: generate( xmlSecDSigCtxDestroy( pDsigCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //Unregistered the stream/URI binding if( xUriBinding.is() ) @@ -203,7 +203,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate( setErrorRecorder( ); - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -212,7 +212,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate( pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ; if( pDsigCtx == NULL ) { - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); clearErrorRecorder(); return aTemplate; } @@ -237,7 +237,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate( } xmlSecDSigCtxDestroy( pDsigCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //Unregistered the stream/URI binding if( xUriBinding.is() ) diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 7519362e4b0e..fbdc24266100 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -143,7 +143,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( setErrorRecorder( ); - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -152,7 +152,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( pEncCtx = xmlSecEncCtxCreate( pMngr ) ; if( pEncCtx == NULL ) { - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); return aTemplate; @@ -164,7 +164,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 ) { xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); @@ -172,7 +172,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( } xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //get the new EncryptedData element if (isParentRef) @@ -262,7 +262,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( if( pSecEnv == NULL ) throw RuntimeException() ; - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -271,7 +271,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( pEncCtx = xmlSecEncCtxCreate( pMngr ) ; if( pEncCtx == NULL ) { - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); return aTemplate; @@ -284,7 +284,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( //Destroy the encryption context xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //get the decrypted element XMLElementWrapper_XmlSecImpl * ret = new XMLElementWrapper_XmlSecImpl(isParentRef? @@ -298,7 +298,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( { //The decryption fails, continue with the next security environment xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); } } diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index 7d1e669ed89d..23b461aeb389 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -35,9 +35,7 @@ using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::xml::crypto::XXMLSecurityContext ; XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl() - ://i39448 : m_pKeysMngr( NULL ) , - m_nDefaultEnvIndex(-1) - //m_xSecurityEnvironment( NULL ) + : m_nDefaultEnvIndex(-1) { //Init xmlsec library if( xmlSecInit() < 0 ) { @@ -58,15 +56,13 @@ XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl() } } -XMLSecurityContext_NssImpl :: ~XMLSecurityContext_NssImpl() { - //i39448 - +XMLSecurityContext_NssImpl :: ~XMLSecurityContext_NssImpl() +{ xmlDisableStreamInputCallbacks() ; xmlSecCryptoShutdown() ; xmlSecShutdown() ; } -//i39448 : new methods sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException) @@ -126,9 +122,6 @@ void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sa m_nDefaultEnvIndex = nDefaultEnvIndex; } -//i39448 : old methods deleted - - /* XServiceInfo */ OUString SAL_CALL XMLSecurityContext_NssImpl :: getImplementationName() throw( RuntimeException ) { return impl_getImplementationName() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 3362952ae7c8..030cb6524118 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -106,7 +106,7 @@ SAL_CALL XMLSignature_NssImpl :: generate( throw RuntimeException() ; } - //i39448 : the key manager should be retrieved from SecurityEnvironment, instead of SecurityContext + // the key manager should be retrieved from SecurityEnvironment, instead of SecurityContext SecurityEnvironment_NssImpl* pSecEnv = reinterpret_cast<SecurityEnvironment_NssImpl*>( @@ -117,7 +117,7 @@ SAL_CALL XMLSignature_NssImpl :: generate( setErrorRecorder(); - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -126,7 +126,7 @@ SAL_CALL XMLSignature_NssImpl :: generate( pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ; if( pDsigCtx == NULL ) { - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLSignatureException() ; clearErrorRecorder(); return aTemplate; @@ -147,7 +147,7 @@ SAL_CALL XMLSignature_NssImpl :: generate( xmlSecDSigCtxDestroy( pDsigCtx ) ; - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //Unregistered the stream/URI binding if( xUriBinding.is() ) @@ -225,7 +225,7 @@ SAL_CALL XMLSignature_NssImpl :: validate( if( pSecEnv == NULL ) throw RuntimeException() ; - pMngr = pSecEnv->createKeysManager() ; //i39448 + pMngr = pSecEnv->createKeysManager(); if( !pMngr ) { throw RuntimeException() ; } @@ -234,7 +234,7 @@ SAL_CALL XMLSignature_NssImpl :: validate( pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ; if( pDsigCtx == NULL ) { - pSecEnv->destroyKeysManager( pMngr ) ; //i39448 + pSecEnv->destroyKeysManager( pMngr ); //throw XMLSignatureException() ; clearErrorRecorder(); return aTemplate; |