oox/source/crypto/AgileEngine.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7490d04ea29df5be5833f77984849b999be59668
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Nov 29 11:51:15 2017 +0000
ofz: avoid invalid short hashValues
Change-Id: Ib7cd63351f4e5ed053e55fe9c5875ad92c81d762
Reviewed-on: https://gerrit.libreoffice.org/45491
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/oox/source/crypto/AgileEngine.cxx
b/oox/source/crypto/AgileEngine.cxx
index 502b66a0a062..ef1440f5c96e 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -130,7 +130,7 @@ bool AgileEngine::generateEncryptionKey(const OUString&
rPassword)
std::vector<sal_uInt8> hash(mInfo.hashSize, 0);
hashCalc(hash, hashInput, mInfo.hashAlgorithm);
- if (std::equal (hash.begin(), hash.end(), hashValue.begin()) )
+ if (hash.size() <= hashValue.size() && std::equal(hash.begin(),
hash.end(), hashValue.begin()))
{
std::vector<sal_uInt8>& encryptedKeyValue = mInfo.encryptedKeyValue;
calculateBlock(constBlock3, hashFinal, encryptedKeyValue, mKey);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
