sal/qa/rtl/digest/rtl_digest.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
New commits: commit 346a5e85bba832b24376de6f3d7a06979310367d Author: Tor Lillqvist <t...@collabora.com> Date: Sun Mar 23 19:25:55 2014 +0200 WaE: unused variables Change-Id: Ieac3cd6bf9ef883cbc3b295e25867a76ac68b88f diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 0953854..6745ee2 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -191,7 +191,7 @@ public: boost::scoped_array<sal_uInt8> pKeyBuffer(new sal_uInt8[nKeyLen]); rtl_digest_get( handle, pKeyBuffer.get(), nKeyLen ); - OString aSum = createHex(pKeyBuffer.get(), nKeyLen); + createHex(pKeyBuffer.get(), nKeyLen); rtl_digest_destroy( handle ); } @@ -398,6 +398,12 @@ public: } { +#if 0 // Don't remove, but instead fix the test or something + + // With this test case rtl_digest_SHA1 computes the wrong sum. This was confirmed + // by decrytion of a MSO encrypted document. Replacing the rtl_digest_SHA1 calculation + // with sha1 calculation from NSS was able to decrypt the document. + const unsigned char aData[] = { 0x37, 0x5f, 0x47, 0x7a, 0xd2, 0x13, 0xbe, 0xd2, 0x3c, 0x23, 0x33, 0x39, 0x68, 0x21, 0x03, 0x6d, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, @@ -414,11 +420,8 @@ public: OString sKey = createHex(pResult.get(), RTL_DIGEST_LENGTH_SHA1); - // With this test case rtl_digest_SHA1 computes the wrong sum. This was confirmed - // by decrytion of a MSO encrypted document. Replacing the rtl_digest_SHA1 calculation - // with sha1 calculation from NSS was able to decrypt the document. - - //CPPUNIT_ASSERT_EQUAL(sExpected, sKey); + CPPUNIT_ASSERT_EQUAL(sExpected, sKey); +#endif } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits