Merge

--HG--
branch : trunk

1 files changed, 4 insertions, 11 deletions

diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h
index 5c35511ad9f..226fde018ae 100644
--- a/src/shared/Auth/AuthCrypt.h
+++ b/src/shared/Auth/AuthCrypt.h
@@ -22,7 +22,7 @@
 #define _AUTHCRYPT_H
 
 #include <Common.h>
-#include <vector>
+#include "SARC4.h"
 
 class BigNumber;
 
@@ -32,22 +32,15 @@ class AuthCrypt
         AuthCrypt();
         ~AuthCrypt();
 
-        const static size_t CRYPTED_RECV_LEN = 6;
-
-        void Init();
-
-        void SetKey(BigNumber *);
-
+        void Init(BigNumber *K);
         void DecryptRecv(uint8 *, size_t);
         void EncryptSend(uint8 *, size_t);
 
         bool IsInitialized() { return _initialized; }
 
-        static void GenerateKey(uint8 *, BigNumber *);
-
     private:
-        std::vector<uint8> _key;
-        uint8 _send_i, _send_j, _recv_i, _recv_j;
+        SARC4 _clientDecrypt;
+        SARC4 _serverEncrypt;
         bool _initialized;
 };
 #endif