leonetienne/GCrypt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed method DigestFlexblock to CipherFlexblock, and made it public

Browse Source
This commit is contained in:
Leonetienne 2022-05-22 13:04:20 +02:00
parent 734324ec10
commit cf784ca8ac
No known key found for this signature in database
GPG Key ID: C33879CD92E9708C
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GCryptLib/include/GCrypt/GCryptWrapper.h
View File

@ -28,10 +28,11 @@ namespace Leonetienne::GCrypt {
//! @filename_out The file the decrypted version should be saved in. //! @filename_out The file the decrypted version should be saved in.
static bool DecryptFile(const std::string& filename_in, const std::string& filename_out, const std::string& password, bool printProgressReport = false); static bool DecryptFile(const std::string& filename_in, const std::string& filename_out, const std::string& password, bool printProgressReport = false);
//! Will enncrypt or decrypt an entire flexblock of binary data, given a key.
static Flexblock CipherFlexblock(const Flexblock& data, const Block& key, const GCipher::DIRECTION direction);
private: private:
//! Will digest a flexblock with a key
static Flexblock DigestFlexblock(const Flexblock& data, const Block& key, const GCipher::DIRECTION direction);
// No instanciation! >:( // No instanciation! >:(
GCryptWrapper(); GCryptWrapper();

14
GCryptLib/src/GCryptWrapper.cpp
View File

@ -12,7 +12,7 @@ namespace Leonetienne::GCrypt {
const Flexblock cleartext_bits = StringToBits(cleartext); const Flexblock cleartext_bits = StringToBits(cleartext);
// Encrypt our cleartext bits // Encrypt our cleartext bits
const Flexblock ciphertext_bits = DigestFlexblock(cleartext_bits, key, GCipher::DIRECTION::ENCIPHER); const Flexblock ciphertext_bits = CipherFlexblock(cleartext_bits, key, GCipher::DIRECTION::ENCIPHER);
// Recode the ciphertext bits to a hex-string // Recode the ciphertext bits to a hex-string
const std::string ciphertext = BitsToHexstring(ciphertext_bits); const std::string ciphertext = BitsToHexstring(ciphertext_bits);
@ -29,7 +29,7 @@ namespace Leonetienne::GCrypt {
const Flexblock ciphertext_bits = HexstringToBits(ciphertext); const Flexblock ciphertext_bits = HexstringToBits(ciphertext);
// Decrypt the ciphertext bits // Decrypt the ciphertext bits
const std::string cleartext_bits = DigestFlexblock(ciphertext_bits, key, GCipher::DIRECTION::DECIPHER); const std::string cleartext_bits = CipherFlexblock(ciphertext_bits, key, GCipher::DIRECTION::DECIPHER);
// Recode the cleartext bits to an ascii-string // Recode the cleartext bits to an ascii-string
const std::string cleartext = BitsToString(cleartext_bits); const std::string cleartext = BitsToString(cleartext_bits);
@ -47,7 +47,7 @@ namespace Leonetienne::GCrypt {
const Block key = PasswordToKey(password); const Block key = PasswordToKey(password);
// Encrypt our cleartext bits // Encrypt our cleartext bits
const Flexblock ciphertext_bits = DigestFlexblock(cleartext_bits, key, GCipher::DIRECTION::ENCIPHER); const Flexblock ciphertext_bits = CipherFlexblock(cleartext_bits, key, GCipher::DIRECTION::ENCIPHER);
// Write our ciphertext bits to file // Write our ciphertext bits to file
WriteBitsToFile(filename_out, ciphertext_bits); WriteBitsToFile(filename_out, ciphertext_bits);
@ -68,7 +68,7 @@ namespace Leonetienne::GCrypt {
const Block key = PasswordToKey(password); const Block key = PasswordToKey(password);
// Decrypt the ciphertext bits // Decrypt the ciphertext bits
const Flexblock cleartext_bits = DigestFlexblock(ciphertext_bits, key, GCipher::DIRECTION::DECIPHER); const Flexblock cleartext_bits = CipherFlexblock(ciphertext_bits, key, GCipher::DIRECTION::DECIPHER);
// Write our cleartext bits to file // Write our cleartext bits to file
WriteBitsToFile(filename_out, cleartext_bits); WriteBitsToFile(filename_out, cleartext_bits);
@ -80,7 +80,11 @@ namespace Leonetienne::GCrypt {
} }
} }
Flexblock GCryptWrapper::DigestFlexblock(const Flexblock& data, const Block& key, const GCipher::DIRECTION direction) { Flexblock GCryptWrapper::CipherFlexblock(
const Flexblock& data,
const Block& key,
const GCipher::DIRECTION direction)
{
// Split input into blocks // Split input into blocks
std::vector<Block> blocks; std::vector<Block> blocks;