Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
0366bcb3
Commit
0366bcb3
authored
Sep 07, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cfb
parent
ab3add95
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
Common/3dParty/icu/fetch.sh
Common/3dParty/icu/fetch.sh
+3
-3
OfficeCryptReader/source/CryptTransform.cpp
OfficeCryptReader/source/CryptTransform.cpp
+12
-12
No files found.
Common/3dParty/icu/fetch.sh
View file @
0366bcb3
...
...
@@ -38,11 +38,11 @@ fi
if
[[
"
$platform
"
==
*
"linux"
*
]]
then
if
[
[
-f
"./icu.zip"
]
]
if
[
-f
"./icu.zip"
]
then
echo
"icu already downloaded"
else
if
[
[
"
$arch
"
==
*
"_64"
*
]
]
if
[
"
$arch
"
==
*
"_64"
*
]
then
wget
-O
icu.zip http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-RHEL6-x64.tgz
else
...
...
@@ -59,7 +59,7 @@ cp "./usr/local/lib/libicudata.so.55.1" "build/libicudata.so.55"
cp
"./usr/local/lib/libicuuc.so.55.1"
"build/libicuuc.so.55"
fi
if
[
[
"
$platform
"
==
*
"mac"
*
]
]
if
[
"
$platform
"
==
*
"mac"
*
]
then
if
[
-d
"./icu"
]
then
...
...
OfficeCryptReader/source/CryptTransform.cpp
View file @
0366bcb3
...
...
@@ -359,12 +359,12 @@ bool EncryptCipher(_buf & key, _buf & iv, _buf & data_inp, _buf & data_out, CRYP
case
CRYPT_METHOD
:
:
AES_CBC
:
modeEncryption
=
new
CipherModeFinalTemplate_ExternalCipher
<
CBC_Encryption
>
(
aesEncryption
,
iv
.
ptr
);
break
;
case
CRYPT_METHOD
:
:
AES_CFB
:
#if defined(_IOS)
return
false
;
#else
modeEncryption
=
new
CFB_Mode_ExternalCipher
::
Encryption
(
aesEncryption
,
iv
.
ptr
);
#endif
//
case CRYPT_METHOD::AES_CFB:
//
#if defined(_IOS)
//
return false;
//
#else
//
modeEncryption = new CFB_Mode_ExternalCipher::Encryption(aesEncryption, iv.ptr );
//
#endif
break
;
}
...
...
@@ -416,12 +416,12 @@ bool DecryptCipher(_buf & key, _buf & iv, _buf & data_inp, _buf & data_out, CRY
case
CRYPT_METHOD
:
:
AES_CBC
:
modeDecryption
=
new
CipherModeFinalTemplate_ExternalCipher
<
CBC_Decryption
>
(
aesDecryption
,
iv
.
ptr
);
break
;
case
CRYPT_METHOD
:
:
AES_CFB
:
#if defined(_IOS)
return
false
;
#else
modeDecryption
=
new
CFB_Mode_ExternalCipher
::
Decryption
(
aesDecryption
,
iv
.
ptr
);
#endif
//
case CRYPT_METHOD::AES_CFB:
//
#if defined(_IOS)
//
return false;
//
#else
//
modeDecryption = new CFB_Mode_ExternalCipher::Decryption(aesDecryption, iv.ptr );
//
#endif
}
if
(
!
modeDecryption
)
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment