Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
extensions/source/svg/svgaction.cxx
extensions/source/svg/svgaction.hxx
extensions/source/svg/svgcom.hxx
extensions/source/svg/svgprinter.cxx
extensions/source/svg/svgprinter.hxx
extensions/source/svg/svguno.cxx
extensions/source/svg/svgwriter.cxx
extensions/source/svg/svgwriter.hxx
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
package/inc/ZipFile.hxx
package/inc/ZipOutputStream.hxx
package/inc/ZipPackage.hxx
package/inc/ZipPackageStream.hxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/ManifestImport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/xstorage.cxx
package/source/xstor/xstorage.hxx
package/source/zipapi/EntryInputStream.cxx
package/source/zipapi/EntryInputStream.hxx
package/source/zipapi/XFileStream.cxx
package/source/zipapi/XFileStream.hxx
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XUnbufferedStream.cxx
package/source/zipapi/XUnbufferedStream.hxx
package/source/zipapi/ZipFile.cxx
package/source/zipapi/ZipOutputStream.cxx
package/source/zipapi/sha1context.hxx
package/source/zippackage/ZipPackage.cxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
xmlsecurity/prj/build.lst
xmlsecurity/source/helper/xmlsignaturehelper.cxx
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx

1 files changed, 28 insertions, 14 deletions

diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 226a19e529b5..ed7be23ea429 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -36,9 +36,12 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <HashMaps.hxx>
+#include <com/sun/star/xml/crypto/CipherID.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+
+#include <HashMaps.hxx>
 #include <osl/file.h>
 #include <mutexholder.hxx>
 #include <vector>
@@ -83,18 +86,24 @@ class ZipPackage : public cppu::WeakImplHelper7
 protected:
     SotMutexHolderRef m_aMutexHolder;
 
-    ::com::sun::star::uno::Sequence < sal_Int8 > m_aEncryptionKey;
-    FolderHash       m_aRecent;
-    ::rtl::OUString  m_aURL;
-    sal_Bool         m_bHasEncryptedEntries;
-    sal_Bool         m_bHasNonEncryptedEntries;
-    sal_Bool         m_bInconsistent;
-    sal_Bool         m_bUseManifest;
-    sal_Bool         m_bForceRecovery;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aStorageEncryptionKeys;
+    ::com::sun::star::uno::Sequence< sal_Int8 > m_aEncryptionKey;
+
+    FolderHash        m_aRecent;
+    ::rtl::OUString   m_aURL;
 
-    sal_Bool        m_bMediaTypeFallbackUsed;
-    sal_Int32       m_nFormat;
-    sal_Bool        m_bAllowRemoveOnInsert;
+    sal_Int32         m_nStartKeyGenerationID;
+    sal_Int32         m_nChecksumDigestID;
+    sal_Int32         m_nCommonEncryptionID;
+    sal_Bool          m_bHasEncryptedEntries;
+    sal_Bool          m_bHasNonEncryptedEntries;
+
+    sal_Bool          m_bInconsistent;
+    sal_Bool          m_bForceRecovery;
+
+    sal_Bool          m_bMediaTypeFallbackUsed;
+    sal_Int32         m_nFormat;
+    sal_Bool          m_bAllowRemoveOnInsert;
 
     InitialisationMode m_eMode;
 
@@ -121,15 +130,20 @@ protected:
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xTempStream );
 
 public:
-    ZipPackage (const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory);
+    ZipPackage( const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory );
     virtual ~ZipPackage( void );
     ZipFile& getZipFile() { return *m_pZipFile;}
-    const com::sun::star::uno::Sequence < sal_Int8 > & getEncryptionKey ( ) {return m_aEncryptionKey;}
     sal_Int32 getFormat() const { return m_nFormat; }
 
+    sal_Int32 GetStartKeyGenID() const { return m_nStartKeyGenerationID; }
+    sal_Int32 GetEncAlgID() const { return m_nCommonEncryptionID; }
+    sal_Int32 GetChecksumAlgID() const { return m_nChecksumDigestID; }
+    sal_Int32 GetDefaultDerivedKeySize() const { return m_nCommonEncryptionID == ::com::sun::star::xml::crypto::CipherID::AES_CBC_W3C_PADDING ? 32 : 16; }
+
     SotMutexHolderRef GetSharedMutexRef() { return m_aMutexHolder; }
 
     void ConnectTo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
+    const ::com::sun::star::uno::Sequence< sal_Int8 > GetEncryptionKey();
 
     // XInitialization
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )