From 7bcdfcab8bf73964f626817a2935a1780e0a12f3 Mon Sep 17 00:00:00 2001 From: Leonetienne Date: Mon, 6 Dec 2021 13:02:37 +0100 Subject: [PATCH] Fixed comment... --- GhettoCrypt/Cipher.cpp | 1 + GhettoCrypt/Feistel.cpp | 2 +- INCLUDE/GhettoCrypt.cpp | 3 ++- INCLUDE/GhettoCrypt.h | 32 ++++++++++++++++---------------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/GhettoCrypt/Cipher.cpp b/GhettoCrypt/Cipher.cpp index 335a9d2..fd56f2c 100644 --- a/GhettoCrypt/Cipher.cpp +++ b/GhettoCrypt/Cipher.cpp @@ -112,6 +112,7 @@ GhettoCipher::Flexblock GhettoCipher::Cipher::Decipher(const Flexblock& data, bo return ss.str(); } +// These pragmas only work for MSVC and g++, as far as i know. Beware!!! #if defined _WIN32 || defined _WIN64 #pragma optimize("", off ) #elif defined __GNUG__ diff --git a/GhettoCrypt/Feistel.cpp b/GhettoCrypt/Feistel.cpp index b1340a5..b9138a2 100644 --- a/GhettoCrypt/Feistel.cpp +++ b/GhettoCrypt/Feistel.cpp @@ -191,7 +191,7 @@ void GhettoCipher::Feistel::GenerateRoundKeys(const Block& seedKey) return; } -// These pragmas only work for MSVC, as far as i know. Beware!!! +// These pragmas only work for MSVC and g++, as far as i know. Beware!!! #if defined _WIN32 || defined _WIN64 #pragma optimize("", off ) #elif defined __GNUG__ diff --git a/INCLUDE/GhettoCrypt.cpp b/INCLUDE/GhettoCrypt.cpp index cbe3b0c..5b614b3 100644 --- a/INCLUDE/GhettoCrypt.cpp +++ b/INCLUDE/GhettoCrypt.cpp @@ -142,6 +142,7 @@ GhettoCipher::Flexblock GhettoCipher::Cipher::Decipher(const Flexblock& data, bo return ss.str(); } +// These pragmas only work for MSVC and g++, as far as i know. Beware!!! #if defined _WIN32 || defined _WIN64 #pragma optimize("", off ) #elif defined __GNUG__ @@ -354,7 +355,7 @@ void GhettoCipher::Feistel::GenerateRoundKeys(const Block& seedKey) return; } -// These pragmas only work for MSVC, as far as i know. Beware!!! +// These pragmas only work for MSVC and g++, as far as i know. Beware!!! #if defined _WIN32 || defined _WIN64 #pragma optimize("", off ) #elif defined __GNUG__ diff --git a/INCLUDE/GhettoCrypt.h b/INCLUDE/GhettoCrypt.h index e24566a..fa9eff0 100644 --- a/INCLUDE/GhettoCrypt.h +++ b/INCLUDE/GhettoCrypt.h @@ -28,11 +28,6 @@ #pragma once -/*** ./../GhettoCrypt/Version.h ***/ - -#pragma once -#define GHETTOCRYPT_VERSION 0.1 - /*** ./../GhettoCrypt/GhettoCryptWrapper.h ***/ #pragma once @@ -80,6 +75,11 @@ namespace GhettoCipher typedef std::string Flexblock; } +/*** ./../GhettoCrypt/Version.h ***/ + +#pragma once +#define GHETTOCRYPT_VERSION 0.1 + /*** ./../GhettoCrypt/Config.h ***/ #pragma once @@ -90,17 +90,6 @@ namespace GhettoCipher constexpr int N_ROUNDS = 64; } -/*** ./../GhettoCrypt/Halfblock.h ***/ - -#pragma once -#include - -namespace GhettoCipher -{ - constexpr int HALFBLOCK_SIZE = (BLOCK_SIZE / 2); - typedef std::bitset Halfblock; -} - /*** ./../GhettoCrypt/Block.h ***/ #pragma once @@ -372,6 +361,17 @@ namespace GhettoCipher } } +/*** ./../GhettoCrypt/Halfblock.h ***/ + +#pragma once +#include + +namespace GhettoCipher +{ + constexpr int HALFBLOCK_SIZE = (BLOCK_SIZE / 2); + typedef std::bitset Halfblock; +} + /*** ./../GhettoCrypt/Keyset.h ***/ #pragma once