2 files changed, 4 insertions, 4 deletions
diff --git a/CPP/7zip/Crypto/RarAES/RarAES.cpp b/CPP/7zip/Crypto/RarAES/RarAES.cpp
index f978e275..cb907ec2 100755
--- a/CPP/7zip/Crypto/RarAES/RarAES.cpp
+++ b/CPP/7zip/Crypto/RarAES/RarAES.cpp
@@ -76,14 +76,14 @@ STDMETHODIMP CDecoder::CryptoSetPassword(const Byte *data, UInt32 size)
 STDMETHODIMP CDecoder::Init()
 {
   Calculate();
-  AesSetKeyDecode(&Aes.aes, aesKey, kRarAesKeySize);
-  AesCbcInit(&Aes, aesInit);
+  Aes_SetKeyDecode(&Aes.aes, aesKey, kRarAesKeySize);
+  AesCbc_Init(&Aes, aesInit);
   return S_OK;
 }
 
 STDMETHODIMP_(UInt32) CDecoder::Filter(Byte *data, UInt32 size)
 {
-  return AesCbcDecode(&Aes, data, size);
+  return (UInt32)AesCbc_Decode(&Aes, data, size);
 }
 
 void CDecoder::Calculate()
diff --git a/CPP/7zip/Crypto/RarAES/RarAES.h b/CPP/7zip/Crypto/RarAES/RarAES.h
index aea948d8..a99ad531 100755
--- a/CPP/7zip/Crypto/RarAES/RarAES.h
+++ b/CPP/7zip/Crypto/RarAES/RarAES.h
@@ -12,7 +12,7 @@
 
 extern "C" 
 { 
-#include "../../../../C/Crypto/Aes.h"
+#include "../../../../C/Aes.h"
 }
 
 namespace NCrypto {