Hi Petr, all,

as per my ESC action item, a last-minute addition to libreoffice-3-5
- please note, that this is explicitely *not* meant for master.

Cheers,

-- Thorsten
From 9e59955324609de3819ccf1619feb32df360c0a0 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehr...@suse.com>
Date: Tue, 17 Apr 2012 16:10:37 +0200
Subject: [PATCH] Fix fdo#47484 - use older ODF encryption by default.

As recently discussed, 3.5.x will use the older, more backwards-
compatible encryption methods, as a way to transition people over.
Starting with 3.6, the stronger AES will be the default. In all
versions, this is configurable though.
---
 .../schema/org/openoffice/Office/Common.xcs        |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index d2ce681..205c784 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2814,9 +2814,9 @@
             <author>MAV</author>
             <desc>Specifies whether SHA1 algorithm instead of SHA256 should be
             used in ODF12 for StartKey and Checksum generation during
-            encryption.</desc>
+            encryption. If true, compatible with older OOo/LibO versions.</desc>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
         <prop
             oor:name="UseBlowfishInODF12" oor:type="xs:boolean"
@@ -2824,9 +2824,9 @@
           <info>
             <author>MAV</author>
             <desc>Specifies whether Blowfish algorithm instead of AES should be
-            used in ODF12 for encryption.</desc>
+            used in ODF12 for encryption. If true, compatible with older OOo/LibO versions.</desc>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
       </group>
     </group>
-- 
1.7.7

Attachment: pgptaPwrKuiVQ.pgp
Description: PGP signature

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Reply via email to