projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove header files from .cvsignore.
[openssl.git]
/
crypto
/
des
/
set_key.c
diff --git
a/crypto/des/set_key.c
b/crypto/des/set_key.c
index 99ac2734843e8e3a4115a0aa2523f32488002abe..52f0f8aff941623fca81eb9a72ecab8af7df37e4 100644
(file)
--- a/
crypto/des/set_key.c
+++ b/
crypto/des/set_key.c
@@
-1,5
+1,5
@@
/* crypto/des/set_key.c */
/* crypto/des/set_key.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-68,30
+68,28
@@
#include "sk.h"
#ifndef NOPROTO
#include "sk.h"
#ifndef NOPROTO
-static int check_parity(
des_cblock (*key)
);
+static int check_parity(
const des_cblock key
);
#else
static int check_parity();
#endif
int des_check_key=0;
#else
static int check_parity();
#endif
int des_check_key=0;
-void des_set_odd_parity(key)
-des_cblock (*key);
+void des_set_odd_parity(des_cblock key)
{
int i;
for (i=0; i<DES_KEY_SZ; i++)
{
int i;
for (i=0; i<DES_KEY_SZ; i++)
-
(*key)[i]=odd_parity[(*key)
[i]];
+
key[i]=odd_parity[key
[i]];
}
}
-static int check_parity(key)
-des_cblock (*key);
+static int check_parity(const des_cblock key)
{
int i;
for (i=0; i<DES_KEY_SZ; i++)
{
{
int i;
for (i=0; i<DES_KEY_SZ; i++)
{
- if (
(*key)[i] != odd_parity[(*key)
[i]])
+ if (
key[i] != odd_parity[key
[i]])
return(0);
}
return(1);
return(0);
}
return(1);
@@
-111,8
+109,8
@@
static des_cblock weak_keys[NUM_WEAK_KEY]={
/* weak keys */
{0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
{0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE},
/* weak keys */
{0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
{0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE},
- {0x1F,0x1F,0x1F,0x1F,0x
1F,0x1F,0x1F,0x1F
},
- {0xE0,0xE0,0xE0,0xE0,0x
E0,0xE0,0xE0,0xE0
},
+ {0x1F,0x1F,0x1F,0x1F,0x
0E,0x0E,0x0E,0x0E
},
+ {0xE0,0xE0,0xE0,0xE0,0x
F1,0xF1,0xF1,0xF1
},
/* semi-weak keys */
{0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE},
{0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01},
/* semi-weak keys */
{0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE},
{0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01},
@@
-127,8
+125,7
@@
static des_cblock weak_keys[NUM_WEAK_KEY]={
{0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
{0xFE,0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1}};
{0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
{0xFE,0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1}};
-int des_is_weak_key(key)
-des_cblock (*key);
+int des_is_weak_key(const des_cblock key)
{
int i;
{
int i;
@@
-157,13
+154,11
@@
des_cblock (*key);
* return -1 if key parity error,
* return -2 if illegal weak key.
*/
* return -1 if key parity error,
* return -2 if illegal weak key.
*/
-int des_set_key(key, schedule)
-des_cblock (*key);
-des_key_schedule schedule;
+int des_set_key(const des_cblock key, des_key_schedule schedule)
{
static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
register DES_LONG c,d,t,s,t2;
{
static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
register DES_LONG c,d,t,s,t2;
- register unsigned char *in;
+ register
const
unsigned char *in;
register DES_LONG *k;
register int i;
register DES_LONG *k;
register int i;
@@
-177,7
+172,7
@@
des_key_schedule schedule;
}
k=(DES_LONG *)schedule;
}
k=(DES_LONG *)schedule;
- in=
(unsigned char *)
key;
+ in=key;
c2l(in,c);
c2l(in,d);
c2l(in,c);
c2l(in,d);
@@
-238,9
+233,7
@@
des_key_schedule schedule;
return(0);
}
return(0);
}
-int des_key_sched(key, schedule)
-des_cblock (*key);
-des_key_schedule schedule;
+int des_key_sched(const des_cblock key, des_key_schedule schedule)
{
return(des_set_key(key,schedule));
}
{
return(des_set_key(key,schedule));
}