summaryrefslogtreecommitdiff
path: root/src/common/des.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-03-13 01:32:32 +0100
committerHaru <haru@dotalux.com>2016-07-12 20:58:32 +0200
commit3a19ceb903629a9ff7ce85f800c1b4fefc8aa2c5 (patch)
tree6d53af669e4ff00876a8e44261a6b9672ad172ee /src/common/des.c
parenta19ecac6d3405652f766eb7b18c7ee6a3270a78b (diff)
downloadhercules-3a19ceb903629a9ff7ce85f800c1b4fefc8aa2c5.tar.gz
hercules-3a19ceb903629a9ff7ce85f800c1b4fefc8aa2c5.tar.bz2
hercules-3a19ceb903629a9ff7ce85f800c1b4fefc8aa2c5.tar.xz
hercules-3a19ceb903629a9ff7ce85f800c1b4fefc8aa2c5.zip
Removed unnecessary typedefs from des.h
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common/des.c')
-rw-r--r--src/common/des.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/common/des.c b/src/common/des.c
index c811dd96c..706aafbdd 100644
--- a/src/common/des.c
+++ b/src/common/des.c
@@ -40,9 +40,9 @@ static const uint8_t mask[8] = {
/// Initial permutation (IP).
-static void IP(BIT64* src)
+static void IP(struct BIT64 *src)
{
- BIT64 tmp = {{0}};
+ struct BIT64 tmp = {{0}};
static const uint8_t ip_table[64] = {
58, 50, 42, 34, 26, 18, 10, 2,
@@ -68,9 +68,9 @@ static void IP(BIT64* src)
/// Final permutation (IP^-1).
-static void FP(BIT64* src)
+static void FP(struct BIT64 *src)
{
- BIT64 tmp = {{0}};
+ struct BIT64 tmp = {{0}};
static const uint8_t fp_table[64] = {
40, 8, 48, 16, 56, 24, 64, 32,
@@ -97,9 +97,9 @@ static void FP(BIT64* src)
/// Expansion (E).
/// Expands upper four 8-bits (32b) into eight 6-bits (48b).
-static void E(BIT64* src)
+static void E(struct BIT64 *src)
{
- BIT64 tmp = {{0}};
+ struct BIT64 tmp = {{0}};
#if 0
// original
@@ -137,9 +137,9 @@ static void E(BIT64* src)
/// Transposition (P-BOX).
-static void TP(BIT64* src)
+static void TP(struct BIT64 *src)
{
- BIT64 tmp = {{0}};
+ struct BIT64 tmp = {{0}};
static const uint8_t tp_table[32] = {
16, 7, 20, 21,
@@ -166,9 +166,9 @@ static void TP(BIT64* src)
/// Substitution boxes (S-boxes).
/// NOTE: This implementation was optimized to process two nibbles in one step (twice as fast).
-static void SBOX(BIT64* src)
+static void SBOX(struct BIT64 *src)
{
- BIT64 tmp = {{0}};
+ struct BIT64 tmp = {{0}};
static const uint8_t s_table[4][64] = {
{
@@ -207,9 +207,9 @@ static void SBOX(BIT64* src)
/// DES round function.
/// XORs src[0..3] with TP(SBOX(E(src[4..7]))).
-static void RoundFunction(BIT64* src)
+static void RoundFunction(struct BIT64 *src)
{
- BIT64 tmp = *src;
+ struct BIT64 tmp = *src;
E(&tmp);
SBOX(&tmp);
TP(&tmp);
@@ -221,7 +221,7 @@ static void RoundFunction(BIT64* src)
}
-void des_decrypt_block(BIT64* block)
+void des_decrypt_block(struct BIT64 *block)
{
IP(block);
RoundFunction(block);
@@ -231,7 +231,7 @@ void des_decrypt_block(BIT64* block)
void des_decrypt(unsigned char* data, size_t size)
{
- BIT64* p = (BIT64*)data;
+ struct BIT64 *p = (struct BIT64 *)data;
size_t i;
for( i = 0; i*8 < size; i += 8 )