Skip to content

Commit

Permalink
des: more const
Browse files Browse the repository at this point in the history 
Co-authored-by: Pierre Alain <[email protected]>
  • Loading branch information
@hannesm @palainp
hannesm and palainp committed Mar 27, 2024
1 parent 49e569b commit 9e0dd81
Showing 1 changed file with 22 additions and 21 deletions.
43 changes: 22 additions & 21 deletions src/native/des_generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
#define DE1 1 /* MODE == decrypt */

static void scrunch(const unsigned char *, unsigned long *);
static void unscrun(unsigned long *, unsigned char *);
static void unscrun(const unsigned long *, unsigned char *);
static void desfunc(unsigned long *, const unsigned long *);
static void cookey(unsigned long *, unsigned long[32]);
static void cookey(const unsigned long *, unsigned long[32]);

static unsigned short bytebit[8] = {
static const unsigned short bytebit[8] = {
0200, 0100, 040, 020, 010, 04, 02, 01 };

static unsigned long bigbyte[24] = {
static const unsigned long bigbyte[24] = {
0x800000L, 0x400000L, 0x200000L, 0x100000L,
0x80000L, 0x40000L, 0x20000L, 0x10000L,
0x8000L, 0x4000L, 0x2000L, 0x1000L,
Expand All @@ -38,22 +38,22 @@ static unsigned long bigbyte[24] = {

/* Use the key schedule specified in the Standard (ANSI X3.92-1981). */

static unsigned char pc1[56] = {
static const unsigned char pc1[56] = {
56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17,
9, 1, 58, 50, 42, 34, 26, 18, 10, 2, 59, 51, 43, 35,
62, 54, 46, 38, 30, 22, 14, 6, 61, 53, 45, 37, 29, 21,
13, 5, 60, 52, 44, 36, 28, 20, 12, 4, 27, 19, 11, 3 };

static unsigned char totrot[16] = {
static const unsigned char totrot[16] = {
1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28 };

static unsigned char pc2[48] = {
static const unsigned char pc2[48] = {
13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9,
22, 18, 11, 3, 25, 7, 15, 6, 26, 19, 12, 1,
40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,
43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31 };

void mc_deskey(unsigned char key[8], short edf, unsigned long into[32]) /* Thanks to James Gillogly & Phil Karn! */
void mc_deskey(const unsigned char key[8], short edf, unsigned long into[32]) /* Thanks to James Gillogly & Phil Karn! */
{
int i, j, l, m, n;
unsigned char pc1m[56], pcr[56];
Expand Down Expand Up @@ -88,9 +88,10 @@ void mc_deskey(unsigned char key[8], short edf, unsigned long into[32]) /* Thank
return;
}

static void cookey(unsigned long *raw1, unsigned long into[32])
static void cookey(const unsigned long *raw1, unsigned long into[32])
{
unsigned long *cook, *raw0;
unsigned long *cook;
const unsigned long *raw0;
unsigned long dough[32];
int i;

Expand Down Expand Up @@ -126,7 +127,7 @@ static void scrunch(const unsigned char *outof, unsigned long *into)
}


static void unscrun(unsigned long *outof, unsigned char *into)
static void unscrun(const unsigned long *outof, unsigned char *into)
{
*into++ = (*outof >> 24) & 0xffL;
*into++ = (*outof >> 16) & 0xffL;
Expand All @@ -139,7 +140,7 @@ static void unscrun(unsigned long *outof, unsigned char *into)
return;
}

static unsigned long SP1[64] = {
static const unsigned long SP1[64] = {
0x01010400L, 0x00000000L, 0x00010000L, 0x01010404L,
0x01010004L, 0x00010404L, 0x00000004L, 0x00010000L,
0x00000400L, 0x01010400L, 0x01010404L, 0x00000400L,
Expand All @@ -157,7 +158,7 @@ static unsigned long SP1[64] = {
0x00000404L, 0x01000400L, 0x01000400L, 0x00000000L,
0x00010004L, 0x00010400L, 0x00000000L, 0x01010004L };

static unsigned long SP2[64] = {
static const unsigned long SP2[64] = {
0x80108020L, 0x80008000L, 0x00008000L, 0x00108020L,
0x00100000L, 0x00000020L, 0x80100020L, 0x80008020L,
0x80000020L, 0x80108020L, 0x80108000L, 0x80000000L,
Expand All @@ -175,7 +176,7 @@ static unsigned long SP2[64] = {
0x00108000L, 0x00000000L, 0x80008000L, 0x00008020L,
0x80000000L, 0x80100020L, 0x80108020L, 0x00108000L };

static unsigned long SP3[64] = {
static const unsigned long SP3[64] = {
0x00000208L, 0x08020200L, 0x00000000L, 0x08020008L,
0x08000200L, 0x00000000L, 0x00020208L, 0x08000200L,
0x00020008L, 0x08000008L, 0x08000008L, 0x00020000L,
Expand All @@ -193,7 +194,7 @@ static unsigned long SP3[64] = {
0x08020000L, 0x08000208L, 0x00000208L, 0x08020000L,
0x00020208L, 0x00000008L, 0x08020008L, 0x00020200L };

static unsigned long SP4[64] = {
static const unsigned long SP4[64] = {
0x00802001L, 0x00002081L, 0x00002081L, 0x00000080L,
0x00802080L, 0x00800081L, 0x00800001L, 0x00002001L,
0x00000000L, 0x00802000L, 0x00802000L, 0x00802081L,
Expand All @@ -211,7 +212,7 @@ static unsigned long SP4[64] = {
0x00002001L, 0x00002080L, 0x00800000L, 0x00802001L,
0x00000080L, 0x00800000L, 0x00002000L, 0x00802080L };

static unsigned long SP5[64] = {
static const unsigned long SP5[64] = {
0x00000100L, 0x02080100L, 0x02080000L, 0x42000100L,
0x00080000L, 0x00000100L, 0x40000000L, 0x02080000L,
0x40080100L, 0x00080000L, 0x02000100L, 0x40080100L,
Expand All @@ -229,7 +230,7 @@ static unsigned long SP5[64] = {
0x00080100L, 0x02000100L, 0x40000100L, 0x00080000L,
0x00000000L, 0x40080000L, 0x02080100L, 0x40000100L };

static unsigned long SP6[64] = {
static const unsigned long SP6[64] = {
0x20000010L, 0x20400000L, 0x00004000L, 0x20404010L,
0x20400000L, 0x00000010L, 0x20404010L, 0x00400000L,
0x20004000L, 0x00404010L, 0x00400000L, 0x20000010L,
Expand All @@ -247,7 +248,7 @@ static unsigned long SP6[64] = {
0x00004000L, 0x00400010L, 0x20004010L, 0x00000000L,
0x20404000L, 0x20000000L, 0x00400010L, 0x20004010L };

static unsigned long SP7[64] = {
static const unsigned long SP7[64] = {
0x00200000L, 0x04200002L, 0x04000802L, 0x00000000L,
0x00000800L, 0x04000802L, 0x00200802L, 0x04200800L,
0x04200802L, 0x00200000L, 0x00000000L, 0x04000002L,
Expand All @@ -265,7 +266,7 @@ static unsigned long SP7[64] = {
0x00000000L, 0x00200802L, 0x04200000L, 0x00000800L,
0x04000002L, 0x04000800L, 0x00000800L, 0x00200002L };

static unsigned long SP8[64] = {
static const unsigned long SP8[64] = {
0x10001040L, 0x00001000L, 0x00040000L, 0x10041040L,
0x10000000L, 0x10001040L, 0x00000040L, 0x10000000L,
0x00040040L, 0x10040000L, 0x10041040L, 0x00041000L,
Expand Down Expand Up @@ -369,9 +370,9 @@ void mc_Ddes(const unsigned char from[8], unsigned char into[8], const unsigned
return;
}

void mc_des3key(unsigned char hexkey[24], short mode, unsigned long into[96])
void mc_des3key(const unsigned char hexkey[24], short mode, unsigned long into[96])
{
unsigned char *first, *third;
const unsigned char *first, *third;
short revmod;

if( mode == EN0 ) {
Expand Down

0 comments on commit 9e0dd81

Please sign in to comment.