sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preparing crypt utility functions.

Browse Source
This commit is contained in:
lotodore
2010-07-14 07:26:21 +00:00
parent 7c01f727c7
commit 9b196eacdd
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/crypthelper.cpp
+18 -6
View File
@@ -186,7 +186,7 @@ CryptHelper::MD5Sum(const std::string &fileName, MD5Buf &buf)
} }
bool bool
CryptHelper::SHA1Hash(unsigned char *data, unsigned dataSize, SHA1Buf &buf) CryptHelper::SHA1Hash(const unsigned char *data, unsigned dataSize, SHA1Buf &buf)
{ {
bool retVal; bool retVal;
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
@@ -201,7 +201,7 @@ CryptHelper::SHA1Hash(unsigned char *data, unsigned dataSize, SHA1Buf &buf)
} }
bool bool
CryptHelper::HMACSha1(unsigned char *keyData, unsigned keySize, unsigned char *plainData, unsigned plainSize, SHA1Buf &buf) CryptHelper::HMACSha1(const unsigned char *keyData, unsigned keySize, const unsigned char *plainData, unsigned plainSize, SHA1Buf &buf)
{ {
bool retVal; bool retVal;
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
@@ -232,7 +232,7 @@ CryptHelper::HMACSha1(unsigned char *keyData, unsigned keySize, unsigned char *p
} }
bool bool
CryptHelper::AES128Encrypt(unsigned char *keyData, unsigned keySize, unsigned char *plainData, unsigned plainSize, std::vector<unsigned char> &outCipher) CryptHelper::AES128Encrypt(const unsigned char *keyData, unsigned keySize, const unsigned char *plainData, unsigned plainSize, std::vector<unsigned char> &outCipher)
{ {
bool retVal = false; bool retVal = false;
if (keySize && plainSize) if (keySize && plainSize)
@@ -261,12 +261,13 @@ CryptHelper::AES128Encrypt(unsigned char *keyData, unsigned keySize, unsigned ch
memcpy(iv, keyBuf1.GetData() + sizeof(key), tmpivBytes); memcpy(iv, keyBuf1.GetData() + sizeof(key), tmpivBytes);
memcpy(iv + tmpivBytes, keyBuf2.GetData(), sizeof(iv) - tmpivBytes); memcpy(iv + tmpivBytes, keyBuf2.GetData(), sizeof(iv) - tmpivBytes);
// Perform the encryption. // Perform the encryption.
int cipherSize = plainSize + AESBlockSize; // Maximum possible size + 1
outCipher.resize(cipherSize);
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
EVP_CIPHER_CTX encryptCtx; EVP_CIPHER_CTX encryptCtx;
EVP_CIPHER_CTX_init(&encryptCtx); EVP_CIPHER_CTX_init(&encryptCtx);
EVP_EncryptInit(&encryptCtx, EVP_aes_128_cbc(), key, iv); EVP_EncryptInit(&encryptCtx, EVP_aes_128_cbc(), key, iv);
int cipherSize = plainSize + AESBlockSize; // Maximum possible size + 1
outCipher.resize(cipherSize);
int updateCipherSize = cipherSize; int updateCipherSize = cipherSize;
EVP_EncryptUpdate(&encryptCtx, &outCipher[0], &updateCipherSize, plainData, plainSize); EVP_EncryptUpdate(&encryptCtx, &outCipher[0], &updateCipherSize, plainData, plainSize);
if (updateCipherSize) if (updateCipherSize)
@@ -279,7 +280,18 @@ CryptHelper::AES128Encrypt(unsigned char *keyData, unsigned keySize, unsigned ch
else else
outCipher.clear(); outCipher.clear();
#else #else
// TODO gcry_cipher_hd_t hd;
gcry_error_t err = gcry_cipher_open (&hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, 0);
if (!err)
{
gcry_cipher_setkey(hd, key, sizeof(key));
gcry_cipher_setiv(hd, iv, sizeof(iv));
err = gcry_cipher_encrypt(hd, &outCipher[0], cipherSize, plainData, plainSize);
if (!err)
{
retVal = true;
}
}
#endif #endif
} }
return retVal; return retVal;