39805f6518
No need to derive password-based key, simply skip rtl_digest_PBKDF2 for the gpg4libre case. Also pass down PBKDF2 iteration count from ZipPackage, which knows about GPG encryption, instead of just always setting it in package stream. We otherwise needlessly iterate session key also for gpg encrypted storages. Change-Id: Ic96b2193f8541bbd109795fb9c0212a0a10c7344 Reviewed-on: https://gerrit.libreoffice.org/47783 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
123 lines
4.9 KiB
C++
123 lines
4.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF 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 .
|
|
*/
|
|
#ifndef INCLUDED_PACKAGE_INC_ZIPPACKAGEFOLDER_HXX
|
|
#define INCLUDED_PACKAGE_INC_ZIPPACKAGEFOLDER_HXX
|
|
|
|
#include <com/sun/star/container/XNameContainer.hpp>
|
|
#include <com/sun/star/container/XEnumerationAccess.hpp>
|
|
#include <com/sun/star/beans/StringPair.hpp>
|
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
|
#include "HashMaps.hxx"
|
|
#include "ZipPackageEntry.hxx"
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <vector>
|
|
|
|
class ZipOutputStream;
|
|
struct ZipEntry;
|
|
|
|
class ZipPackageFolder : public cppu::ImplInheritanceHelper
|
|
<
|
|
ZipPackageEntry,
|
|
css::container::XNameContainer,
|
|
css::container::XEnumerationAccess
|
|
>
|
|
{
|
|
private:
|
|
ContentHash maContents;
|
|
OUString m_sVersion;
|
|
|
|
public:
|
|
|
|
ZipPackageFolder( const css::uno::Reference < css::uno::XComponentContext >& xContext,
|
|
sal_Int32 nFormat,
|
|
bool bAllowRemoveOnInsert );
|
|
virtual ~ZipPackageFolder() override;
|
|
|
|
const OUString& GetVersion() const { return m_sVersion; }
|
|
void SetVersion( const OUString& aVersion ) { m_sVersion = aVersion; }
|
|
|
|
bool LookForUnexpectedODF12Streams( const OUString& aPath );
|
|
|
|
void setChildStreamsTypeByExtension( const css::beans::StringPair& aPair );
|
|
|
|
/// @throws css::lang::IllegalArgumentException
|
|
/// @throws css::container::ElementExistException
|
|
/// @throws css::lang::WrappedTargetException
|
|
/// @throws css::uno::RuntimeException
|
|
void doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent );
|
|
|
|
ZipContentInfo& doGetByName( const OUString& aName );
|
|
|
|
static css::uno::Sequence < sal_Int8 > static_getImplementationId();
|
|
|
|
void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
|
|
void setRemoveOnInsertMode_Impl( bool bRemove ) { mbAllowRemoveOnInsert = bRemove; }
|
|
|
|
virtual bool saveChild( const OUString &rPath,
|
|
std::vector < css::uno::Sequence < css::beans::PropertyValue > > &rManList,
|
|
ZipOutputStream & rZipOut,
|
|
const css::uno::Sequence < sal_Int8 >& rEncryptionKey,
|
|
sal_Int32 nPBKDF2IterationCount,
|
|
const rtlRandomPool &rRandomPool ) override;
|
|
|
|
// Recursive functions
|
|
/// @throws css::uno::RuntimeException
|
|
void saveContents(
|
|
const OUString &rPath,
|
|
std::vector < css::uno::Sequence < css::beans::PropertyValue > > &rManList,
|
|
ZipOutputStream & rZipOut,
|
|
const css::uno::Sequence< sal_Int8 > &rEncryptionKey,
|
|
sal_Int32 nPBKDF2IterationCount,
|
|
const rtlRandomPool & rRandomPool) const;
|
|
|
|
// XNameContainer
|
|
virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
|
|
virtual void SAL_CALL removeByName( const OUString& Name ) override;
|
|
|
|
// XEnumerationAccess
|
|
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) override;
|
|
|
|
// XElementAccess
|
|
virtual css::uno::Type SAL_CALL getElementType( ) override;
|
|
virtual sal_Bool SAL_CALL hasElements( ) override;
|
|
|
|
// XNameAccess
|
|
virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
|
|
virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override;
|
|
virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
|
|
|
|
// XNameReplace
|
|
virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
|
|
|
|
// XPropertySet
|
|
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
|
|
virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
|
|
|
|
// XUnoTunnel
|
|
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
|
|
|
|
// XServiceInfo
|
|
virtual OUString SAL_CALL getImplementationName( ) override;
|
|
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
|
|
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
|
|
};
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|