diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-22 21:08:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-22 21:09:59 +0100 |
| commit | 4f07175cd03bf0fa42992a06d51aed5b421adcf2 (patch) | |
| tree | 9ec7f7607a7c6911a29cb5f0405873925f5005d6 /sc | |
| parent | fix 32bit builds (diff) | |
| download | core-4f07175cd03bf0fa42992a06d51aed5b421adcf2.tar.gz core-4f07175cd03bf0fa42992a06d51aed5b421adcf2.zip | |
implement CryptoAPI RC4+SHA1 encryption scheme for doc import
there might be other variants out there in practice, but this
works for default encrypted doc of word 2013
Change-Id: I995a0437d4001d63e1c3a821e00c05a2af429356
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index c854d75af154..bb80a929b35f 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -1152,7 +1152,7 @@ XclImpDecrypterRef lclReadFilepass8_Strong(XclImpStream& rStream) rStream.Ignore(nHeaderSize - actualHeaderSize); info.verifier.saltSize = rStream.ReaduInt32(); - if (info.verifier.saltSize != 16) + if (info.verifier.saltSize != msfilter::SALT_LENGTH) return xDecr; rStream.Read(&info.verifier.salt, sizeof(info.verifier.salt)); rStream.Read(&info.verifier.encryptedVerifier, sizeof(info.verifier.encryptedVerifier)); |