switch to the DES_ api, dont provide any compat glue
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12748 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -62,18 +62,18 @@
|
||||
* used. The extra state information to record how much of the
|
||||
* 64bit block we have used is contained in *num;
|
||||
*/
|
||||
void des_ede3_ofb64_encrypt(in, out, length, k1,k2,k3, ivec, num)
|
||||
void DES_ede3_ofb64_encrypt(in, out, length, k1,k2,k3, ivec, num)
|
||||
register unsigned char *in;
|
||||
register unsigned char *out;
|
||||
long length;
|
||||
des_key_schedule k1,k2,k3;
|
||||
des_cblock (*ivec);
|
||||
DES_key_schedule *k1,*k2,*k3;
|
||||
DES_cblock (*ivec);
|
||||
int *num;
|
||||
{
|
||||
register DES_LONG v0,v1;
|
||||
register int n= *num;
|
||||
register long l=length;
|
||||
des_cblock d;
|
||||
DES_cblock d;
|
||||
register char *dp;
|
||||
DES_LONG ti[2];
|
||||
unsigned char *iv;
|
||||
@@ -93,7 +93,7 @@ int *num;
|
||||
{
|
||||
ti[0]=v0;
|
||||
ti[1]=v1;
|
||||
des_encrypt3((DES_LONG *)ti,k1,k2,k3);
|
||||
DES_encrypt3((DES_LONG *)ti,k1,k2,k3);
|
||||
v0=ti[0];
|
||||
v1=ti[1];
|
||||
|
||||
@@ -118,14 +118,14 @@ int *num;
|
||||
}
|
||||
|
||||
#ifdef undef /* MACRO */
|
||||
void des_ede2_ofb64_encrypt(in, out, length, k1,k2, ivec, num)
|
||||
void DES_ede2_ofb64_encrypt(in, out, length, k1,k2, ivec, num)
|
||||
register unsigned char *in;
|
||||
register unsigned char *out;
|
||||
long length;
|
||||
des_key_schedule k1,k2;
|
||||
des_cblock (*ivec);
|
||||
DES_key_schedule *k1,*k2;
|
||||
DES_cblock (*ivec);
|
||||
int *num;
|
||||
{
|
||||
des_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
|
||||
DES_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user