oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

switch to the DES_ api, dont provide any compat glue

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12748 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-09-03 09:26:03 +00:00
parent 992f32ca35
commit 49e0243cc5
29 changed files with 590 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/des/xcbc_enc.c
View File

@@ -79,10 +79,12 @@ static unsigned char desx_white_in2out[256]={
0xA7,0x1C,0xC9,0x09,0x69,0x9A,0x83,0xCF,0x29,0x39,0xB9,0xE9,0x4C,0xFF,0x43,0xAB,
};
void des_xwhite_in2out(des_key,in_white,out_white)
des_cblock (*des_key);
des_cblock (*in_white);
des_cblock (*out_white);
void DES_xwhite_in2out(DES_cblock *,DES_cblock *, DES_cblock *);
void DES_xwhite_in2out(des_key,in_white,out_white)
DES_cblock (*des_key);
DES_cblock (*in_white);
DES_cblock (*out_white);
{
unsigned char *key,*in,*out;
int out0,out1;
@@ -111,14 +113,14 @@ des_cblock (*out_white);
}
}
void des_xcbc_encrypt(input, output, length, schedule, ivec, inw,outw,encrypt)
des_cblock (*input);
des_cblock (*output);
void DES_xcbc_encrypt(input, output, length, schedule, ivec, inw,outw,encrypt)
DES_cblock (*input);
DES_cblock (*output);
long length;
des_key_schedule schedule;
des_cblock (*ivec);
des_cblock (*inw);
des_cblock (*outw);
DES_key_schedule *schedule;
DES_cblock (*ivec);
DES_cblock (*inw);
DES_cblock (*outw);
int encrypt;
{
register DES_LONG tin0,tin1;
@@ -150,7 +152,7 @@ int encrypt;
c2l(in,tin1);
tin0^=tout0^inW0; tin[0]=tin0;
tin1^=tout1^inW1; tin[1]=tin1;
des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
DES_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
tout0=tin[0]^outW0; l2c(tout0,out);
tout1=tin[1]^outW1; l2c(tout1,out);
}
@@ -159,7 +161,7 @@ int encrypt;
c2ln(in,tin0,tin1,l+8);
tin0^=tout0^inW0; tin[0]=tin0;
tin1^=tout1^inW1; tin[1]=tin1;
des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
DES_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
tout0=tin[0]^outW0; l2c(tout0,out);
tout1=tin[1]^outW1; l2c(tout1,out);
}
@@ -175,7 +177,7 @@ int encrypt;
{
c2l(in,tin0); tin[0]=tin0^outW0;
c2l(in,tin1); tin[1]=tin1^outW1;
des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
DES_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
tout0=tin[0]^xor0^inW0;
tout1=tin[1]^xor1^inW1;
l2c(tout0,out);
@@ -187,7 +189,7 @@ int encrypt;
{
c2l(in,tin0); tin[0]=tin0^outW0;
c2l(in,tin1); tin[1]=tin1^outW1;
des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
DES_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
tout0=tin[0]^xor0^inW0;
tout1=tin[1]^xor1^inW1;
l2cn(tout0,tout1,out,l+8);