From 80f8059e683ffe599cab57e59ca403b9da6d8f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 16 Dec 1998 02:06:29 +0100
Subject: [PATCH] Constified.
Rev: src/symmetric/desCode.h:1.3
Rev: src/symmetric/include/des.h:1.3
---
desCode.h | 16 ++++++++--------
include/des.h | 4 +++-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/desCode.h b/desCode.h
index f9e2436d..e8ae4bb1 100644
--- a/desCode.h
+++ b/desCode.h
@@ -343,11 +343,11 @@ extern UINT32 des_keymap[], des_bigmap[];
#define ENCRYPT(NAME, TEMP, LOAD, KEYMAP, SAVE) \
\
void \
-NAME(REGISTER BYTE *D, \
- REGISTER UINT32 *r, \
- REGISTER UINT8 *s) \
+NAME(REGISTER BYTE *D, \
+ REGISTER UINT32 *r, \
+ REGISTER const UINT8 *s) \
{ \
- register UINT32 x, y, z; \
+ register UINT32 x, y, z; \
\
/* declare temps & load data */ \
TEMP(LOAD); \
@@ -379,11 +379,11 @@ NAME(REGISTER BYTE *D, \
#define DECRYPT(NAME, TEMP, LOAD, KEYMAP, SAVE) \
\
void \
-NAME(REGISTER BYTE *D, \
- REGISTER UINT32 *r, \
- REGISTER UINT8 *s) \
+NAME(REGISTER BYTE *D, \
+ REGISTER UINT32 *r, \
+ REGISTER const UINT8 *s) \
{ \
- register UINT32 x, y, z; \
+ register UINT32 x, y, z; \
\
/* declare temps & load data */ \
TEMP(LOAD); \
diff --git a/include/des.h b/include/des.h
index 6da93695..4373ddea 100644
--- a/include/des.h
+++ b/include/des.h
@@ -18,9 +18,11 @@ RCSID2(desCore_hRcs, "$Id$");
#define DES_BLOCKSIZE 8
#define DES_EXPANDED_KEYLEN 32
+/* FIXME: typedef on arrays is ugly. */
typedef UINT8 DesData[DES_BLOCKSIZE];
typedef UINT32 DesKeys[DES_EXPANDED_KEYLEN];
-typedef void DesFunc(UINT8 *d, UINT32 *r, UINT8 *s);
+
+typedef void DesFunc(UINT8 *d, UINT32 *r, const UINT8 *s);
extern int DesMethod(UINT32 *method, UINT8 *k);
extern void DesQuickInit(void);
--
GitLab