Kaydet (Commit) d3c189fa authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Fix fdo#50703 clamp ODF1.2 compatibility-mode to use old encryption.

As requested for better interop inside the ODF ecosystem, asking for
compatible odf output gets you blowfish/sha1-based encryption
unconditionally.
üst d0af38ea
......@@ -370,12 +370,12 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
{
}
if ( !aSaveOpt.IsUseSHA1InODF12() )
if ( !aSaveOpt.IsUseSHA1InODF12() && nDefVersion != SvtSaveOptions::ODFVER_012_EXT_COMPAT )
{
aEncryptionAlgs[0].Value <<= xml::crypto::DigestID::SHA256;
aEncryptionAlgs[2].Value <<= xml::crypto::DigestID::SHA256_1K;
}
if ( !aSaveOpt.IsUseBlowfishInODF12() )
if ( !aSaveOpt.IsUseBlowfishInODF12() && nDefVersion != SvtSaveOptions::ODFVER_012_EXT_COMPAT )
aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment