summaryrefslogtreecommitdiff
path: root/src/common/des.c
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-11 20:50:17 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-11 20:50:17 +0000
commitd187830a9f19239d7f43729a51198ed9dd8c176f (patch)
treed58cedc92584ef5e9580c38d95a3070703a1a0f5 /src/common/des.c
parent6ab4ccb4d3d6cb959776d4800bcd5e92b3dd7ac2 (diff)
downloadhercules-d187830a9f19239d7f43729a51198ed9dd8c176f.tar.gz
hercules-d187830a9f19239d7f43729a51198ed9dd8c176f.tar.bz2
hercules-d187830a9f19239d7f43729a51198ed9dd8c176f.tar.xz
hercules-d187830a9f19239d7f43729a51198ed9dd8c176f.zip
* Merged changes up to eAthena 15024.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15064 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/des.c')
-rw-r--r--src/common/des.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/des.c b/src/common/des.c
index 67a3a38d1..917fc33e0 100644
--- a/src/common/des.c
+++ b/src/common/des.c
@@ -19,7 +19,7 @@ static const uint8_t mask[8] = {
/// Initial permutation (IP).
static void IP(BIT64* src)
{
- BIT64 tmp = {0};
+ BIT64 tmp = {{0}};
static const uint8_t ip_table[64] = {
58, 50, 42, 34, 26, 18, 10, 2,
@@ -47,7 +47,7 @@ static void IP(BIT64* src)
/// Final permutation (IP^-1).
static void FP(BIT64* src)
{
- BIT64 tmp = {0};
+ BIT64 tmp = {{0}};
static const uint8_t fp_table[64] = {
40, 8, 48, 16, 56, 24, 64, 32,
@@ -76,7 +76,7 @@ static void FP(BIT64* src)
/// Expands upper four 8-bits (32b) into eight 6-bits (48b).
static void E(BIT64* src)
{
- BIT64 tmp = {0};
+ BIT64 tmp = {{0}};
if( false )
{// original
@@ -118,7 +118,7 @@ else
/// Transposition (P-BOX).
static void TP(BIT64* src)
{
- BIT64 tmp = {0};
+ BIT64 tmp = {{0}};
static const uint8_t tp_table[32] = {
16, 7, 20, 21,
@@ -147,7 +147,7 @@ static void TP(BIT64* src)
/// NOTE: This implementation was optimized to process two nibbles in one step (twice as fast).
static void SBOX(BIT64* src)
{
- BIT64 tmp = {0};
+ BIT64 tmp = {{0}};
static const uint8_t s_table[4][64] = {
{