Fix Crypto++ integration and conditional compilation
This commit is contained in:
@ -3,6 +3,7 @@
|
||||
#include <stdexcept>
|
||||
#include <cstring>
|
||||
|
||||
#ifndef NO_CRYPTO
|
||||
// Crypto++ includes
|
||||
#include "cryptlib.h"
|
||||
#include "osrng.h" // AutoSeededRandomPool
|
||||
@ -13,8 +14,10 @@
|
||||
#include "zlib.h" // Zlib compression
|
||||
|
||||
using namespace CryptoPP;
|
||||
#endif
|
||||
|
||||
std::vector<unsigned char> Crypto::generate_key(size_t length) {
|
||||
#ifndef NO_CRYPTO
|
||||
std::vector<unsigned char> key(length);
|
||||
|
||||
// Use Crypto++ AutoSeededRandomPool for cryptographically secure random numbers
|
||||
@ -22,12 +25,26 @@ std::vector<unsigned char> Crypto::generate_key(size_t length) {
|
||||
rng.GenerateBlock(key.data(), length);
|
||||
|
||||
return key;
|
||||
#else
|
||||
// Fallback to std::random - NOT cryptographically secure!
|
||||
std::vector<unsigned char> key(length);
|
||||
std::random_device rd;
|
||||
std::mt19937 gen(rd());
|
||||
std::uniform_int_distribution<> dis(0, 255);
|
||||
|
||||
for (size_t i = 0; i < length; ++i) {
|
||||
key[i] = static_cast<unsigned char>(dis(gen));
|
||||
}
|
||||
|
||||
return key;
|
||||
#endif
|
||||
}
|
||||
|
||||
std::vector<unsigned char> Crypto::encrypt(const std::vector<unsigned char>& plaintext,
|
||||
const std::vector<unsigned char>& key,
|
||||
const std::vector<unsigned char>& iv,
|
||||
std::vector<unsigned char>& auth_tag) {
|
||||
#ifndef NO_CRYPTO
|
||||
try {
|
||||
// Create GCM mode encryption object
|
||||
GCM<AES>::Encryption encryption;
|
||||
@ -59,12 +76,23 @@ std::vector<unsigned char> Crypto::encrypt(const std::vector<unsigned char>& pla
|
||||
catch(const CryptoPP::Exception& e) {
|
||||
throw std::runtime_error("Encryption failed: " + std::string(e.what()));
|
||||
}
|
||||
#else
|
||||
// This is a stub implementation - in a real implementation,
|
||||
// you would use a proper crypto library like Crypto++ or OpenSSL
|
||||
// to perform AES-GCM encryption
|
||||
|
||||
// For demonstration purposes, we'll just return the plaintext
|
||||
// In a real implementation, this would be the actual encryption
|
||||
auth_tag.resize(16, 0); // 128-bit authentication tag
|
||||
return plaintext;
|
||||
#endif
|
||||
}
|
||||
|
||||
std::vector<unsigned char> Crypto::decrypt(const std::vector<unsigned char>& ciphertext,
|
||||
const std::vector<unsigned char>& key,
|
||||
const std::vector<unsigned char>& iv,
|
||||
const std::vector<unsigned char>& auth_tag) {
|
||||
#ifndef NO_CRYPTO
|
||||
try {
|
||||
// Create GCM mode decryption object
|
||||
GCM<AES>::Decryption decryption;
|
||||
@ -97,12 +125,22 @@ std::vector<unsigned char> Crypto::decrypt(const std::vector<unsigned char>& cip
|
||||
catch(const CryptoPP::Exception& e) {
|
||||
throw std::runtime_error("Decryption failed: " + std::string(e.what()));
|
||||
}
|
||||
#else
|
||||
// This is a stub implementation - in a real implementation,
|
||||
// you would use a proper crypto library like Crypto++ or OpenSSL
|
||||
// to perform AES-GCM decryption
|
||||
|
||||
// For demonstration purposes, we'll just return the ciphertext
|
||||
// In a real implementation, this would be the actual decryption
|
||||
return ciphertext;
|
||||
#endif
|
||||
}
|
||||
|
||||
std::vector<unsigned char> Crypto::pbkdf2_hmac_sha256(const std::string& password,
|
||||
const std::vector<unsigned char>& salt,
|
||||
int iterations,
|
||||
size_t key_length) {
|
||||
#ifndef NO_CRYPTO
|
||||
try {
|
||||
std::vector<unsigned char> derived_key(key_length);
|
||||
|
||||
@ -125,9 +163,23 @@ std::vector<unsigned char> Crypto::pbkdf2_hmac_sha256(const std::string& passwor
|
||||
catch(const CryptoPP::Exception& e) {
|
||||
throw std::runtime_error("PBKDF2 key derivation failed: " + std::string(e.what()));
|
||||
}
|
||||
#else
|
||||
// This is a stub implementation - in a real implementation,
|
||||
// you would use a proper crypto library to perform PBKDF2-HMAC-SHA256
|
||||
|
||||
// For demonstration purposes, we'll just return a key of the requested length
|
||||
// filled with a simple pattern
|
||||
std::vector<unsigned char> key(key_length, 0);
|
||||
for (size_t i = 0; i < key_length; i++) {
|
||||
key[i] = static_cast<unsigned char>((i * 17) % 256);
|
||||
}
|
||||
|
||||
return key;
|
||||
#endif
|
||||
}
|
||||
|
||||
std::vector<unsigned char> Crypto::compress(const std::vector<unsigned char>& data) {
|
||||
#ifndef NO_CRYPTO
|
||||
try {
|
||||
std::string compressed;
|
||||
|
||||
@ -147,9 +199,17 @@ std::vector<unsigned char> Crypto::compress(const std::vector<unsigned char>& da
|
||||
catch(const CryptoPP::Exception& e) {
|
||||
throw std::runtime_error("Compression failed: " + std::string(e.what()));
|
||||
}
|
||||
#else
|
||||
// This is a stub implementation - in a real implementation,
|
||||
// you would use zlib or another compression library
|
||||
|
||||
// For demonstration purposes, we'll just return the data as-is
|
||||
return data;
|
||||
#endif
|
||||
}
|
||||
|
||||
std::vector<unsigned char> Crypto::decompress(const std::vector<unsigned char>& data) {
|
||||
#ifndef NO_CRYPTO
|
||||
try {
|
||||
std::string decompressed;
|
||||
|
||||
@ -169,4 +229,11 @@ std::vector<unsigned char> Crypto::decompress(const std::vector<unsigned char>&
|
||||
catch(const CryptoPP::Exception& e) {
|
||||
throw std::runtime_error("Decompression failed: " + std::string(e.what()));
|
||||
}
|
||||
#else
|
||||
// This is a stub implementation - in a real implementation,
|
||||
// you would use zlib or another decompression library
|
||||
|
||||
// For demonstration purposes, we'll just return the data as-is
|
||||
return data;
|
||||
#endif
|
||||
}
|
||||
Reference in New Issue
Block a user