forked from amazingfate/loongoffice
9188ea83c3
... when importing ODF documents.
In CreatePackageEncryptionData(), add a 3rd SHA1 password hash,
PackageSHA1CorrectEncryptionKey, to EncryptionData.
Use it in ZipPackageStream::getDataStream(), which has 3 fall-backs
for SHA1 bugs now.
Also add a CorrectSHA1DigestContext, to be used together with
PackageSHA1CorrectEncryptionKey, and rename the existing one to
StarOfficeSHA1DigestContext, to be used together with the existing
2 PackageSHA1{UTF8,MS1252}EncryptionKey.
The fallback won't be used very often anyway: for the password SHA1
to be wrong, you need a password between 52 and 55 bytes long,
and for the SHA1/1K checksum to be wrong, you need a file
smaller than 1K with compressed size mod 64 between 52 and 55;
all XML files have enough random "chaff" added to be too large.
Test that we can read both correct SHA1 and StarOffice SHA1.
Change-Id: I988fa489b5e40c7657f404f18538f637d54d28f1
70 lines
2.2 KiB
C++
70 lines
2.2 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_SOURCE_ZIPAPI_SHA1CONTEXT_HXX
|
|
#define INCLUDED_PACKAGE_SOURCE_ZIPAPI_SHA1CONTEXT_HXX
|
|
|
|
#include <com/sun/star/xml/crypto/XDigestContext.hpp>
|
|
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <osl/mutex.hxx>
|
|
|
|
class StarOfficeSHA1DigestContext
|
|
: public cppu::WeakImplHelper<css::xml::crypto::XDigestContext>
|
|
{
|
|
::osl::Mutex m_aMutex;
|
|
void* m_pDigest;
|
|
|
|
StarOfficeSHA1DigestContext()
|
|
: m_pDigest( nullptr )
|
|
{}
|
|
|
|
public:
|
|
|
|
virtual ~StarOfficeSHA1DigestContext() override;
|
|
|
|
static css::uno::Reference< css::xml::crypto::XDigestContext > Create();
|
|
|
|
virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) override;
|
|
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() override;
|
|
|
|
};
|
|
|
|
class CorrectSHA1DigestContext
|
|
: public cppu::WeakImplHelper<css::xml::crypto::XDigestContext>
|
|
{
|
|
struct Impl;
|
|
std::unique_ptr<Impl> m_pImpl;
|
|
|
|
CorrectSHA1DigestContext();
|
|
|
|
public:
|
|
|
|
virtual ~CorrectSHA1DigestContext() override;
|
|
|
|
static css::uno::Reference<css::xml::crypto::XDigestContext> Create();
|
|
|
|
virtual void SAL_CALL updateDigest(const css::uno::Sequence<::sal_Int8>& rData) override;
|
|
virtual css::uno::Sequence<::sal_Int8> SAL_CALL finalizeDigestAndDispose() override;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|