From b9d18b8334fe49f0ed8677e5e431a15c71dee0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 14 Jan 2002 17:02:38 +0100
Subject: [PATCH] Use static const for all tables. (des_set_key): Use a new
const * variable for the parity procesing, for constness reasons.
Rev: src/nettle/des.c:1.6
---
des.c | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/des.c b/des.c
index 0b761a05..9f4f3252 100644
--- a/des.c
+++ b/des.c
@@ -41,14 +41,18 @@ static DECRYPT(DesSmallFipsDecrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS)
/* various tables */
-uint32_t des_keymap[] = {
+static const uint32_t
+des_keymap[] = {
#include "keymap.h"
};
-static uint8_t rotors[] = {
+static const uint8_t
+rotors[] = {
#include "rotors.h"
};
-static char parity[] = {
+
+static const char
+parity[] = {
#include "parity.h"
};
@@ -68,20 +72,23 @@ des_set_key(struct des_ctx *ctx, const uint8_t *key)
register char * b0, * b1;
char bits0[56], bits1[56];
uint32_t *method;
- uint8_t *k;
-
- /* check for bad parity and weak keys */
- b0 = parity;
- n = b0[key[0]]; n <<= 4;
- n |= b0[key[1]]; n <<= 4;
- n |= b0[key[2]]; n <<= 4;
- n |= b0[key[3]]; n <<= 4;
- n |= b0[key[4]]; n <<= 4;
- n |= b0[key[5]]; n <<= 4;
- n |= b0[key[6]]; n <<= 4;
- n |= b0[key[7]];
- w = 0x88888888l;
+ const uint8_t *k;
+ {
+ register const char *b;
+ /* check for bad parity and weak keys */
+ b = parity;
+ n = b[key[0]]; n <<= 4;
+ n |= b[key[1]]; n <<= 4;
+ n |= b[key[2]]; n <<= 4;
+ n |= b[key[3]]; n <<= 4;
+ n |= b[key[4]]; n <<= 4;
+ n |= b[key[5]]; n <<= 4;
+ n |= b[key[6]]; n <<= 4;
+ n |= b[key[7]];
+ w = 0x88888888l;
+ }
+
/* report bad parity in key */
if ( n & w )
{
--
GitLab