Commit 0366bcb3 authored by ElenaSubbotina's avatar ElenaSubbotina

fix cfb

parent ab3add95
...@@ -38,11 +38,11 @@ fi ...@@ -38,11 +38,11 @@ fi
if [[ "$platform" == *"linux"* ]] if [[ "$platform" == *"linux"* ]]
then then
if [[ -f "./icu.zip" ]] if [ -f "./icu.zip" ]
then then
echo "icu already downloaded" echo "icu already downloaded"
else else
if [[ "$arch" == *"_64"* ]] if [ "$arch" == *"_64"* ]
then then
wget -O icu.zip http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-RHEL6-x64.tgz wget -O icu.zip http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-RHEL6-x64.tgz
else else
...@@ -59,7 +59,7 @@ cp "./usr/local/lib/libicudata.so.55.1" "build/libicudata.so.55" ...@@ -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" cp "./usr/local/lib/libicuuc.so.55.1" "build/libicuuc.so.55"
fi fi
if [[ "$platform" == *"mac"* ]] if [ "$platform" == *"mac"* ]
then then
if [ -d "./icu" ] if [ -d "./icu" ]
then then
......
...@@ -359,12 +359,12 @@ bool EncryptCipher(_buf & key, _buf & iv, _buf & data_inp, _buf & data_out, CRYP ...@@ -359,12 +359,12 @@ bool EncryptCipher(_buf & key, _buf & iv, _buf & data_inp, _buf & data_out, CRYP
case CRYPT_METHOD::AES_CBC: case CRYPT_METHOD::AES_CBC:
modeEncryption = new CipherModeFinalTemplate_ExternalCipher<CBC_Encryption>(aesEncryption, iv.ptr ); modeEncryption = new CipherModeFinalTemplate_ExternalCipher<CBC_Encryption>(aesEncryption, iv.ptr );
break; break;
case CRYPT_METHOD::AES_CFB: // case CRYPT_METHOD::AES_CFB:
#if defined(_IOS) //#if defined(_IOS)
return false; // return false;
#else //#else
modeEncryption = new CFB_Mode_ExternalCipher::Encryption(aesEncryption, iv.ptr ); // modeEncryption = new CFB_Mode_ExternalCipher::Encryption(aesEncryption, iv.ptr );
#endif //#endif
break; break;
} }
...@@ -416,12 +416,12 @@ bool DecryptCipher(_buf & key, _buf & iv, _buf & data_inp, _buf & data_out, CRY ...@@ -416,12 +416,12 @@ bool DecryptCipher(_buf & key, _buf & iv, _buf & data_inp, _buf & data_out, CRY
case CRYPT_METHOD::AES_CBC: case CRYPT_METHOD::AES_CBC:
modeDecryption = new CipherModeFinalTemplate_ExternalCipher<CBC_Decryption>(aesDecryption, iv.ptr ); modeDecryption = new CipherModeFinalTemplate_ExternalCipher<CBC_Decryption>(aesDecryption, iv.ptr );
break; break;
case CRYPT_METHOD::AES_CFB: // case CRYPT_METHOD::AES_CFB:
#if defined(_IOS) //#if defined(_IOS)
return false; // return false;
#else //#else
modeDecryption = new CFB_Mode_ExternalCipher::Decryption(aesDecryption, iv.ptr ); // modeDecryption = new CFB_Mode_ExternalCipher::Decryption(aesDecryption, iv.ptr );
#endif //#endif
} }
if (!modeDecryption) return false; if (!modeDecryption) return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment