Removed GMP and added OpenSSL. Rsa class might be moved to Crypto later.

src/framework/CMakeLists.txt

@@ -187,14 +187,14 @@ endif()
 message(STATUS "LuaJIT: " ${LUAJIT})
 
 find_package(PhysFS REQUIRED)
-find_package(GMP REQUIRED)
+find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
 
 set(framework_LIBRARIES ${framework_LIBRARIES}
     ${Boost_LIBRARIES}
     ${LUA_LIBRARY}
     ${PHYSFS_LIBRARY}
-    ${GMP_LIBRARY}
+    ${OPENSSL_LIBRARIES}
     ${ZLIB_LIBRARY}
 )
 
@@ -203,7 +203,7 @@ set(framework_INCLUDE_DIRS ${framework_INCLUDE_DIRS}
     ${OPENGL_INCLUDE_DIR}
     ${LUA_INCLUDE_DIR}
     ${PHYSFS_INCLUDE_DIR}
-    ${GMP_INCLUDE_DIR}
+    ${OpenSSL_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
 )
 

src/framework/luafunctions.cpp

@@ -85,6 +85,8 @@ void Application::registerLuaFunctions()
     g_lua.registerSingletonClass("g_crypt");
     g_lua.bindClassStaticFunction("g_crypt", "encrypt", Crypt::encrypt);
     g_lua.bindClassStaticFunction("g_crypt", "decrypt", Crypt::decrypt);
+    g_lua.bindClassStaticFunction("g_crypt", "sha1Encode", Crypt::sha1Encode);
+    g_lua.bindClassStaticFunction("g_crypt", "md5Encode", Crypt::md5Encode);
 
     // Clock
     g_lua.registerSingletonClass("g_clock");

src/framework/net/inputmessage.cpp

@@ -86,10 +86,13 @@ std::string InputMessage::getString()
     return std::string(v, stringLength);
 }
 
-bool InputMessage::decryptRsa(int size, const std::string& p, const std::string& q, const std::string& d)
+bool InputMessage::decryptRsa(int size, const std::string& key, const std::string& p, const std::string& q, const std::string& d)
 {
     checkRead(size);
-    RSA::decrypt((char*)m_buffer + m_readPos, size, p.c_str(), q.c_str(), d.c_str());
+    g_rsa.setPublic(key.c_str(), "65537");
+    g_rsa.setPrivate(p.c_str(), q.c_str(), d.c_str());
+    g_rsa.check();
+    g_rsa.decrypt((unsigned char*)m_buffer + m_readPos, size);
     return (getU8() == 0x00);
 }
 

src/framework/net/inputmessage.h

@@ -52,7 +52,7 @@ public:
     uint32 peekU32() { uint32 v = getU32(); m_readPos-=4; return v; }
     uint64 peekU64() { uint64 v = getU64(); m_readPos-=8; return v; }
 
-    bool decryptRsa(int size, const std::string& p, const std::string& q, const std::string& d);
+    bool decryptRsa(int size, const std::string& key, const std::string& p, const std::string& q, const std::string& d);
 
     int getReadSize() { return m_readPos - m_headerPos; }
     int getReadPos() { return m_readPos; }

src/framework/net/outputmessage.cpp

@@ -94,7 +94,8 @@ void OutputMessage::encryptRsa(int size, const std::string& key)
     if(m_messageSize < size)
         throw stdext::exception("insufficient bytes in buffer to encrypt");
 
-    RSA::encrypt((char*)m_buffer + m_writePos - size, size, key.c_str());
+    g_rsa.setPublic(key.c_str(), "65537");
+    g_rsa.encrypt((unsigned char*)m_buffer + m_writePos - size, size);
 }
 
 void OutputMessage::writeChecksum()

src/framework/util/crypt.cpp

@@ -26,6 +26,9 @@
 #include <boost/uuid/uuid.hpp>
 #include <boost/functional/hash.hpp>
 
+#include <openssl/sha.h>
+#include <openssl/md5.h>
+
 static const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 static inline bool is_base64(unsigned char c) { return (isalnum(c) || (c == '+') || (c == '/')); }
 
@@ -159,3 +162,45 @@ std::string Crypt::decrypt(const std::string& encrypted_string)
     }
     return std::string();
 }
+
+std::string Crypt::md5Encode(std::string decoded_string, bool upperCase)
+{
+    MD5_CTX c;
+    MD5_Init(&c);
+    MD5_Update(&c, decoded_string.c_str(), decoded_string.length());
+
+    uint8_t md[MD5_DIGEST_LENGTH];
+    MD5_Final(md, &c);
+
+    char output[(MD5_DIGEST_LENGTH << 1) + 1];
+    for(int32_t i = 0; i < (int32_t)sizeof(md); ++i)
+        sprintf(output + (i << 1), "%.2X", md[i]);
+
+    std::string result = output;
+    if(upperCase)
+        return result;
+
+    std::transform(result.begin(), result.end(), result.begin(), tolower);
+    return result;
+}
+
+std::string Crypt::sha1Encode(std::string decoded_string, bool upperCase)
+{
+    SHA_CTX c;
+    SHA1_Init(&c);
+    SHA1_Update(&c, decoded_string.c_str(), decoded_string.length());
+
+    uint8_t md[SHA_DIGEST_LENGTH];
+    SHA1_Final(md, &c);
+
+    char output[(SHA_DIGEST_LENGTH << 1) + 1];
+    for(int32_t i = 0; i < (int32_t)sizeof(md); ++i)
+        sprintf(output + (i << 1), "%.2X", md[i]);
+
+    std::string result = output;
+    if(upperCase)
+        return result;
+
+    std::transform(result.begin(), result.end(), result.begin(), tolower);
+    return result;
+}

src/framework/util/crypt.h

@@ -33,6 +33,8 @@ namespace Crypt {
     std::string genUUIDKey();
     std::string encrypt(const std::string& decrypted_string);
     std::string decrypt(const std::string& encrypted_string);
+    std::string md5Encode(std::string decoded_string, bool upperCase);
+    std::string sha1Encode(std::string decoded_string, bool upperCase);
 }
 
 #endif

src/framework/util/rsa.cpp

@@ -21,104 +21,62 @@
  */
 
 #include "rsa.h"
-#include <gmp.h>
+#include <openssl/bn.h>
+#include <openssl/err.h>
 
-void RSA::encrypt(char *msg, int size, const char* key)
+Rsa g_rsa;
+
+Rsa::Rsa()
 {
-    assert(size <= 128);
+    m_rsa = RSA_new();
-
-    mpz_t plain, c;
-    mpz_init2(plain, 1024);
-    mpz_init2(c, 1024);
-
-    mpz_t e;
-    mpz_init(e);
-    mpz_set_ui(e,65537);
-
-    mpz_t mod;
-    mpz_init2(mod, 1024);
-    mpz_set_str(mod, key, 10);
-
-    mpz_import(plain, size, 1, 1, 0, 0, msg);
-    mpz_powm(c, plain, e, mod);
-
-    size_t count = (mpz_sizeinbase(c, 2) + 7)/8;
-    memset(msg, 0, size - count);
-    mpz_export(&msg[size - count], NULL, 1, 1, 0, 0, c);
-
-    mpz_clear(c);
-    mpz_clear(plain);
-    mpz_clear(e);
-    mpz_clear(mod);
 }
 
-void RSA::decrypt(char *msg, int size, const char *p, const char *q, const char *d)
+Rsa::~Rsa()
 {
-    assert(size <= 128);
+    RSA_free(m_rsa);
+}
 
-    mpz_t mp, mq, md, u, dp, dq, mod, c, v1, v2, u2, tmp;
+void Rsa::setPublic(const char *n, const char *e)
-    mpz_init2(mp, 1024);
+{
-    mpz_init2(mq, 1024);
+    BN_dec2bn(&m_rsa->n, n);
-    mpz_init2(md, 1024);
+    BN_dec2bn(&m_rsa->e, e);
-    mpz_init2(u, 1024);
+}
-    mpz_init2(dp, 1024);
-    mpz_init2(dq, 1024);
-    mpz_init2(mod, 1024);
-    mpz_init2(c, 1024);
-    mpz_init2(v1, 1024);
-    mpz_init2(v2, 1024);
-    mpz_init2(u2, 1024);
-    mpz_init2(tmp, 1024);
 
-    mpz_set_str(mp, p, 10);
+void Rsa::setPrivate(const char *p, const char *q, const char *d)
-    mpz_set_str(mq, q, 10);
+{
-    mpz_set_str(md, d, 10);
+    BN_dec2bn(&m_rsa->p, p);
+    BN_dec2bn(&m_rsa->q, q);
+    BN_dec2bn(&m_rsa->d, d);
+}
 
-    mpz_t pm1,qm1;
+bool Rsa::check() // only used by server, that sets both public and private
-    mpz_init2(pm1, 520);
+{
-    mpz_init2(qm1, 520);
+    if(RSA_check_key(m_rsa)) {
+        BN_CTX *ctx = BN_CTX_new();
+        BN_CTX_start(ctx);
 
-    mpz_sub_ui(pm1, mp, 1);
+        BIGNUM *r1 = BN_CTX_get(ctx), *r2 = BN_CTX_get(ctx);
-    mpz_sub_ui(qm1, mq, 1);
+        BN_mod(m_rsa->dmp1, m_rsa->d, r1, ctx);
-    mpz_invert(u, mp, mq);
+        BN_mod(m_rsa->dmq1, m_rsa->d, r2, ctx);
-    mpz_mod(dp, md, pm1);
-    mpz_mod(dq, md, qm1);
 
-    mpz_mul(mod, mp, mq);
+        BN_mod_inverse(m_rsa->iqmp, m_rsa->q, m_rsa->p, ctx);
-
+        return true;
-    mpz_import(c, size, 1, 1, 0, 0, msg);
+    }
-
+    else {
-    mpz_mod(tmp, c, mp);
+        ERR_load_crypto_strings();
-    mpz_powm(v1, tmp, dp, mp);
+        g_logger.error(stdext::format("RSA check failed - %s", ERR_error_string(ERR_get_error(), NULL)));
-    mpz_mod(tmp, c, mq);
+        return false;
-    mpz_powm(v2, tmp, dq, mq);
-    mpz_sub(u2, v2, v1);
-    mpz_mul(tmp, u2, u);
-    mpz_mod(u2, tmp, mq);
-    if(mpz_cmp_si(u2, 0) < 0) {
-        mpz_add(tmp, u2, mq);
-        mpz_set(u2, tmp);
     }
-    mpz_mul(tmp, u2, mp);
+}
-    mpz_set_ui(c, 0);
+
-    mpz_add(c, v1, tmp);
+bool Rsa::encrypt(unsigned char *msg, int size)
-
+{
-    size_t count = (mpz_sizeinbase(c, 2) + 7)/8;
+    assert(size <= 128);
-    memset(msg, 0, size - count);
+    return RSA_public_encrypt(size, msg, msg, m_rsa, RSA_NO_PADDING) != -1;
-    mpz_export(&msg[size - count], NULL, 1, 1, 0, 0, c);
+}
-
+
-    mpz_clear(c);
+bool Rsa::decrypt(unsigned char *msg, int size)
-    mpz_clear(v1);
+{
-    mpz_clear(v2);
+    assert(size <= 128);
-    mpz_clear(u2);
+    return RSA_private_decrypt(size, msg, msg, m_rsa, RSA_NO_PADDING) != -1;
-    mpz_clear(tmp);
-    mpz_clear(pm1);
-    mpz_clear(qm1);
-    mpz_clear(mp);
-    mpz_clear(mq);
-    mpz_clear(md);
-    mpz_clear(u);
-    mpz_clear(dp);
-    mpz_clear(dq);
-    mpz_clear(mod);
 }

src/framework/util/rsa.h

@@ -24,11 +24,25 @@
 #define RSA_H
 
 #include <framework/global.h>
+#include <openssl/rsa.h>
 
-namespace RSA
+class Rsa
 {
-    void encrypt(char *msg, int size, const char *key);
+public:
-    void decrypt(char *msg, int size, const char *p, const char *q, const char *d);
+    Rsa();
+    ~Rsa();
+
+    void setPublic(const char *n, const char *e);
+    void setPrivate(const char *p, const char *q, const char *d);
+    bool check();
+
+    bool encrypt(unsigned char *msg, int size);
+    bool decrypt(unsigned char *msg, int size);
+
+private:
+    RSA *m_rsa;
 };
 
-#endif
+extern Rsa g_rsa;
+
+#endif