Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

* 'develop' of https://github.com/ONLYOFFICE/core:
  fix cfb
  fix cryptopp

Common/3dParty/cryptopp/project/cryptopp.pro

@@ -159,7 +159,8 @@ HEADERS += \
     ../xtrcrypt.h \
     ../zdeflate.h \
     ../zinflate.h \
-    ../zlib.h
+    ../zlib.h \
+    ../blake2.h
 
 SOURCES += \
     ../3way.cpp \
@@ -172,7 +173,6 @@ SOURCES += \
     ../base32.cpp \
     ../base64.cpp \
     ../basecode.cpp \
-    ../bench.cpp \
     ../bench2.cpp \
     ../bfinit.cpp \
     ../blowfish.cpp \
@@ -186,7 +186,6 @@ SOURCES += \
     ../cmac.cpp \
     ../crc.cpp \
     ../cryptlib.cpp \
-    ../cryptlib_bds.cpp \
     ../datatest.cpp \
     ../default.cpp \
     ../des.cpp \
@@ -295,5 +294,6 @@ SOURCES += \
     ../zdeflate.cpp \
     ../zinflate.cpp \
     ../zlib.cpp \
-    ../cpu.cpp
+    ../cpu.cpp \
+    ../*.cpp
 

Common/3dParty/icu/fetch.sh

@@ -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

@@ -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;