mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Produce correct sha256 uri, consume correct uri and original spec typo

Browse Source 
See:
http://tools.oasis-open.org/issues/browse/OFFICE-3702
http://tools.oasis-open.org/issues/browse/OFFICE-3708
This commit is contained in:
Caolán McNamara
2011-08-03 16:41:50 +01:00
parent c4de35ab55
commit 2d775f593a
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/source/manifest/ManifestDefines.hxx
View File

@@ -61,7 +61,10 @@
#define ATTRIBUTE_SALT "manifest:salt"
#define ATTRIBUTE_ITERATION_COUNT "manifest:iteration-count"
#define SHA256_URL "http://www.w3.org/2000/09/xmldsig#sha256"
#define SHA256_URL "http://www.w3.org/2001/04/xmlenc#sha256"
//http://tools.oasis-open.org/issues/browse/OFFICE-3702
//http://tools.oasis-open.org/issues/browse/OFFICE-3708
#define SHA256_URL_TYPO "http://www.w3.org/2000/09/xmldsig#sha256"
#define SHA1_NAME "SHA1"
#define SHA1_URL "http://www.w3.org/2000/09/xmldsig#sha1"

3
package/source/manifest/ManifestImport.cxx
View File

@@ -88,6 +88,7 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV
, sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) )
, sSHA256_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL ) )
, sSHA256_URL_TYPO ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL_TYPO ) )
, sSHA1_Name ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_NAME ) )
, sSHA1_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_URL ) )
@@ -281,7 +282,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
else if ( aConvertedName == sStartKeyAlgElement )
{
OUString aString = aConvertedAttribs[sStartKeyAlgNameAttribute];
if ( aString.equals( sSHA256_URL ) )
if (aString.equals(sSHA256_URL) || aString.equals(sSHA256_URL_TYPO))
{
aSequence[nNumProperty].Name = sStartKeyAlgProperty;
aSequence[nNumProperty++].Value <<= xml::crypto::DigestID::SHA256;

1
package/source/manifest/ManifestImport.hxx
View File

@@ -106,6 +106,7 @@ protected:
const ::rtl::OUString sWhiteSpace;
const ::rtl::OUString sSHA256_URL;
const ::rtl::OUString sSHA256_URL_TYPO;
const ::rtl::OUString sSHA1_Name;
const ::rtl::OUString sSHA1_URL;