Finally(?) fix DES stuff.

This commit is contained in:
Ben Laurie
1999-02-13 21:49:34 +00:00
parent c09c3c4b2f
commit 08853ba82d
13 changed files with 128 additions and 128 deletions

View File

@@ -123,8 +123,8 @@ int enc;
memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
if (key != NULL)
{
des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
des_set_key(key,ctx->c.des_ede.ks1);
des_set_key(&(key[8]),ctx->c.des_ede.ks2);
memcpy( (char *)ctx->c.des_ede.ks3,
(char *)ctx->c.des_ede.ks1,
sizeof(ctx->c.des_ede.ks1));
@@ -144,9 +144,9 @@ int enc;
memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
if (key != NULL)
{
des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
des_set_key(key,ctx->c.des_ede.ks1);
des_set_key(&(key[8]),ctx->c.des_ede.ks2);
des_set_key(&(key[16]),ctx->c.des_ede.ks3);
}
}
@@ -156,10 +156,7 @@ unsigned char *out;
unsigned char *in;
unsigned int inl;
{
des_ede3_ofb64_encrypt(
in,out,
(long)inl,
ctx->c.des_ede.ks1, ctx->c.des_ede.ks2, ctx->c.des_ede.ks3,
(des_cblock *)&(ctx->iv[0]),
&ctx->num);
des_ede3_ofb64_encrypt(in,out,inl,ctx->c.des_ede.ks1,
ctx->c.des_ede.ks2, ctx->c.des_ede.ks3,
&(ctx->iv[0]),&ctx->num);
}