diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-03 16:41:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-03 16:41:50 +0100 |
| commit | c2a40ea477c9f6cb1b3c13f5c159d0ffb57605aa (patch) | |
| tree | 2fc4274009b5aafdb9573fc4da245fed83c0209a /package/source | |
| parent | 3392a231892694622cae947f8e6186d4d4b1119f (diff) | |
Produce correct sha256 uri, consume correct uri and original spec typo
See:
http://tools.oasis-open.org/issues/browse/OFFICE-3702
http://tools.oasis-open.org/issues/browse/OFFICE-3708
Diffstat (limited to 'package/source')
| -rw-r--r-- | package/source/manifest/ManifestDefines.hxx | 5 | ||||
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 3 | ||||
| -rw-r--r-- | package/source/manifest/ManifestImport.hxx | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/package/source/manifest/ManifestDefines.hxx b/package/source/manifest/ManifestDefines.hxx index fe00f84e6..b4fa4b72a 100644 --- a/package/source/manifest/ManifestDefines.hxx +++ b/package/source/manifest/ManifestDefines.hxx @@ -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" diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index a95301cd5..cf5a77785 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -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; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 9aafbb9e7..4b927971c 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -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; |