From 572c75fe974d567e6e133d72e7eb611745c634ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sun, 17 Aug 2003 17:31:51 +0200
Subject: [PATCH] * desCode.h (des_keymap, des_bigmap): Deleted extern
declarations, they conficted with the static definition in des.c. Reported by
Simon Josefsson.
* des.c (DesSmallFipsEncrypt, DesSmallFipsDecrypt): Moved
definitions after the definition of the des_kemap array.
Rev: src/nettle/ChangeLog:1.206
Rev: src/nettle/des.c:1.8
Rev: src/nettle/desCode.h:1.3
---
ChangeLog | 9 +++++++++
des.c | 6 +++---
desCode.h | 3 ---
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 549290f4..2d7ba8ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-17 Niels M�ller <nisse@cuckoo.hack.org>
+
+ * desCode.h (des_keymap, des_bigmap): Deleted extern declarations,
+ they conficted with the static definition in des.c. Reported by
+ Simon Josefsson.
+
+ * des.c (DesSmallFipsEncrypt, DesSmallFipsDecrypt): Moved
+ definitions after the definition of the des_kemap array.
+
2003-08-11 Niels M�ller <nisse@cuckoo.hack.org>
* rsa-encrypt.c (rsa_encrypt): Bugfix contributed by
diff --git a/des.c b/des.c
index cccfe0d4..c9f294c2 100644
--- a/des.c
+++ b/des.c
@@ -40,9 +40,6 @@
#include "desCode.h"
-static ENCRYPT(DesSmallFipsEncrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS)
-static DECRYPT(DesSmallFipsDecrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS)
-
/* various tables */
static const uint32_t
@@ -60,6 +57,9 @@ parity[] = {
#include "parity.h"
};
+static ENCRYPT(DesSmallFipsEncrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS)
+static DECRYPT(DesSmallFipsDecrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS)
+
void
des_fix_parity(unsigned length, uint8_t *dst,
const uint8_t *src)
diff --git a/desCode.h b/desCode.h
index 52469521..cdb30873 100644
--- a/desCode.h
+++ b/desCode.h
@@ -9,9 +9,6 @@
#include "des.h"
-extern const uint32_t des_keymap[];
-extern const uint32_t des_bigmap[];
-
/* optional customization:
* the idea here is to alter the code so it will still run correctly
* on any machine, but the quickest on the specific machine in mind.
--
GitLab