Key schedules are given as arguments a bit differently in 0.9.6 and
earlier. Also, it was an error to define crypt() at all times.
This commit is contained in:
parent
e9dad4048f
commit
fc0bdd1aa8
1 changed files with 37 additions and 35 deletions
|
@ -84,7 +84,9 @@ int main(int argc, char *argv[])
|
|||
#else
|
||||
#include <openssl/des.h>
|
||||
|
||||
#if defined(PERL5) || defined(__FreeBSD__) || defined(NeXT)
|
||||
#define crypt(c,s) (des_crypt((c),(s)))
|
||||
#endif
|
||||
|
||||
/* tisk tisk - the test keys don't all have odd parity :-( */
|
||||
/* test data */
|
||||
|
@ -407,8 +409,8 @@ int main(int argc, char *argv[])
|
|||
memcpy(in,plain_data[i],8);
|
||||
memset(out,0,8);
|
||||
memset(outin,0,8);
|
||||
des_ecb_encrypt(&in,&out,&ks,DES_ENCRYPT);
|
||||
des_ecb_encrypt(&out,&outin,&ks,DES_DECRYPT);
|
||||
des_ecb_encrypt(&in,&out,ks,DES_ENCRYPT);
|
||||
des_ecb_encrypt(&out,&outin,ks,DES_DECRYPT);
|
||||
|
||||
if (memcmp(out,cipher_data[i],8) != 0)
|
||||
{
|
||||
|
@ -435,8 +437,8 @@ int main(int argc, char *argv[])
|
|||
memcpy(in,plain_data[i],8);
|
||||
memset(out,0,8);
|
||||
memset(outin,0,8);
|
||||
des_ecb2_encrypt(&in,&out,&ks,&ks2,DES_ENCRYPT);
|
||||
des_ecb2_encrypt(&out,&outin,&ks,&ks2,DES_DECRYPT);
|
||||
des_ecb2_encrypt(&in,&out,ks,ks2,DES_ENCRYPT);
|
||||
des_ecb2_encrypt(&out,&outin,ks,ks2,DES_DECRYPT);
|
||||
|
||||
if (memcmp(out,cipher_ecb2[i],8) != 0)
|
||||
{
|
||||
|
@ -463,7 +465,7 @@ int main(int argc, char *argv[])
|
|||
memset(cbc_out,0,40);
|
||||
memset(cbc_in,0,40);
|
||||
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
|
||||
des_ncbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,&ks,
|
||||
des_ncbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
|
||||
&iv3,DES_ENCRYPT);
|
||||
if (memcmp(cbc_out,cbc_ok,32) != 0)
|
||||
{
|
||||
|
@ -472,7 +474,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
|
||||
des_ncbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,&ks,
|
||||
des_ncbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
|
||||
&iv3,DES_DECRYPT);
|
||||
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)) != 0)
|
||||
{
|
||||
|
@ -490,7 +492,7 @@ int main(int argc, char *argv[])
|
|||
memset(cbc_out,0,40);
|
||||
memset(cbc_in,0,40);
|
||||
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
|
||||
des_xcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,&ks,
|
||||
des_xcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
|
||||
&iv3,&cbc2_key,&cbc3_key, DES_ENCRYPT);
|
||||
if (memcmp(cbc_out,xcbc_ok,32) != 0)
|
||||
{
|
||||
|
@ -498,7 +500,7 @@ int main(int argc, char *argv[])
|
|||
err=1;
|
||||
}
|
||||
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
|
||||
des_xcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,&ks,
|
||||
des_xcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
|
||||
&iv3,&cbc2_key,&cbc3_key, DES_DECRYPT);
|
||||
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
|
||||
{
|
||||
|
@ -529,9 +531,9 @@ int main(int argc, char *argv[])
|
|||
/* i=((i+7)/8)*8; */
|
||||
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
|
||||
|
||||
des_ede3_cbc_encrypt(cbc_data,cbc_out,16L,&ks,&ks2,&ks3,&iv3,
|
||||
des_ede3_cbc_encrypt(cbc_data,cbc_out,16L,ks,ks2,ks3,&iv3,
|
||||
DES_ENCRYPT);
|
||||
des_ede3_cbc_encrypt(&(cbc_data[16]),&(cbc_out[16]),i-16,&ks,&ks2,&ks3,
|
||||
des_ede3_cbc_encrypt(&(cbc_data[16]),&(cbc_out[16]),i-16,ks,ks2,ks3,
|
||||
&iv3,DES_ENCRYPT);
|
||||
if (memcmp(cbc_out,cbc3_ok,
|
||||
(unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
|
||||
|
@ -549,7 +551,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
|
||||
des_ede3_cbc_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,DES_DECRYPT);
|
||||
des_ede3_cbc_encrypt(cbc_out,cbc_in,i,ks,ks2,ks3,&iv3,DES_DECRYPT);
|
||||
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
|
||||
{
|
||||
int n;
|
||||
|
@ -573,14 +575,14 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
memset(cbc_out,0,40);
|
||||
memset(cbc_in,0,40);
|
||||
des_pcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,&ks,
|
||||
des_pcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
|
||||
&cbc_iv,DES_ENCRYPT);
|
||||
if (memcmp(cbc_out,pcbc_ok,32) != 0)
|
||||
{
|
||||
printf("pcbc_encrypt encrypt error\n");
|
||||
err=1;
|
||||
}
|
||||
des_pcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,&ks,&cbc_iv,
|
||||
des_pcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,&cbc_iv,
|
||||
DES_DECRYPT);
|
||||
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
|
||||
{
|
||||
|
@ -606,7 +608,7 @@ int main(int argc, char *argv[])
|
|||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
for (i=0; i<sizeof(plain); i++)
|
||||
des_cfb_encrypt(&(plain[i]),&(cfb_buf1[i]),
|
||||
8,1,&ks,&cfb_tmp,DES_ENCRYPT);
|
||||
8,1,ks,&cfb_tmp,DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher8,cfb_buf1,sizeof(plain)) != 0)
|
||||
{
|
||||
printf("cfb_encrypt small encrypt error\n");
|
||||
|
@ -616,7 +618,7 @@ int main(int argc, char *argv[])
|
|||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
for (i=0; i<sizeof(plain); i++)
|
||||
des_cfb_encrypt(&(cfb_buf1[i]),&(cfb_buf2[i]),
|
||||
8,1,&ks,&cfb_tmp,DES_DECRYPT);
|
||||
8,1,ks,&cfb_tmp,DES_DECRYPT);
|
||||
if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
|
||||
{
|
||||
printf("cfb_encrypt small decrypt error\n");
|
||||
|
@ -631,7 +633,7 @@ int main(int argc, char *argv[])
|
|||
printf("Doing ofb\n");
|
||||
DES_set_key_checked(&ofb_key,&ks);
|
||||
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
|
||||
des_ofb_encrypt(plain,ofb_buf1,64,sizeof(plain)/8,&ks,&ofb_tmp);
|
||||
des_ofb_encrypt(plain,ofb_buf1,64,sizeof(plain)/8,ks,&ofb_tmp);
|
||||
if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
|
||||
{
|
||||
printf("ofb_encrypt encrypt error\n");
|
||||
|
@ -644,7 +646,7 @@ ofb_buf1[8+4], ofb_cipher[8+5], ofb_cipher[8+6], ofb_cipher[8+7]);
|
|||
err=1;
|
||||
}
|
||||
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
|
||||
des_ofb_encrypt(ofb_buf1,ofb_buf2,64,sizeof(ofb_buf1)/8,&ks,&ofb_tmp);
|
||||
des_ofb_encrypt(ofb_buf1,ofb_buf2,64,sizeof(ofb_buf1)/8,ks,&ofb_tmp);
|
||||
if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
|
||||
{
|
||||
printf("ofb_encrypt decrypt error\n");
|
||||
|
@ -665,7 +667,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
|
|||
num=0;
|
||||
for (i=0; i<sizeof(plain); i++)
|
||||
{
|
||||
des_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,&ks,&ofb_tmp,
|
||||
des_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,&ofb_tmp,
|
||||
&num);
|
||||
}
|
||||
if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
|
||||
|
@ -675,7 +677,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
|
|||
}
|
||||
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
|
||||
num=0;
|
||||
des_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),&ks,&ofb_tmp,
|
||||
des_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,&ofb_tmp,
|
||||
&num);
|
||||
if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
|
||||
{
|
||||
|
@ -691,8 +693,8 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
|
|||
num=0;
|
||||
for (i=0; i<sizeof(plain); i++)
|
||||
{
|
||||
des_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,&ks,&ks,
|
||||
&ks,&ofb_tmp,&num);
|
||||
des_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,ks,
|
||||
ks,&ofb_tmp,&num);
|
||||
}
|
||||
if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
|
||||
{
|
||||
|
@ -701,7 +703,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
|
|||
}
|
||||
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
|
||||
num=0;
|
||||
des_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),&ks,&ks,&ks,
|
||||
des_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,ks,ks,
|
||||
&ofb_tmp,&num);
|
||||
if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
|
||||
{
|
||||
|
@ -711,7 +713,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
|
|||
|
||||
printf("Doing cbc_cksum\n");
|
||||
DES_set_key_checked(&cbc_key,&ks);
|
||||
cs=des_cbc_cksum(cbc_data,&cret,strlen((char *)cbc_data),&ks,&cbc_iv);
|
||||
cs=des_cbc_cksum(cbc_data,&cret,strlen((char *)cbc_data),ks,&cbc_iv);
|
||||
if (cs != cbc_cksum_ret)
|
||||
{
|
||||
printf("bad return value (%08lX), should be %08lX\n",
|
||||
|
@ -791,7 +793,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
|
|||
{
|
||||
printf(" %d",i);
|
||||
des_ncbc_encrypt(&(cbc_out[i]),cbc_in,
|
||||
strlen((char *)cbc_data)+1,&ks,
|
||||
strlen((char *)cbc_data)+1,ks,
|
||||
&cbc_iv,DES_ENCRYPT);
|
||||
}
|
||||
printf("\noutput word alignment test");
|
||||
|
@ -799,7 +801,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
|
|||
{
|
||||
printf(" %d",i);
|
||||
des_ncbc_encrypt(cbc_out,&(cbc_in[i]),
|
||||
strlen((char *)cbc_data)+1,&ks,
|
||||
strlen((char *)cbc_data)+1,ks,
|
||||
&cbc_iv,DES_ENCRYPT);
|
||||
}
|
||||
printf("\n");
|
||||
|
@ -848,7 +850,7 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
|
|||
|
||||
DES_set_key_checked(&cfb_key,&ks);
|
||||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
des_cfb_encrypt(plain,cfb_buf1,bits,sizeof(plain),&ks,&cfb_tmp,
|
||||
des_cfb_encrypt(plain,cfb_buf1,bits,sizeof(plain),ks,&cfb_tmp,
|
||||
DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
|
||||
{
|
||||
|
@ -858,7 +860,7 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
|
|||
printf("%s\n",pt(&(cfb_buf1[i])));
|
||||
}
|
||||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
des_cfb_encrypt(cfb_buf1,cfb_buf2,bits,sizeof(plain),&ks,&cfb_tmp,
|
||||
des_cfb_encrypt(cfb_buf1,cfb_buf2,bits,sizeof(plain),ks,&cfb_tmp,
|
||||
DES_DECRYPT);
|
||||
if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
|
||||
{
|
||||
|
@ -878,8 +880,8 @@ static int cfb64_test(unsigned char *cfb_cipher)
|
|||
DES_set_key_checked(&cfb_key,&ks);
|
||||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
n=0;
|
||||
des_cfb64_encrypt(plain,cfb_buf1,12,&ks,&cfb_tmp,&n,DES_ENCRYPT);
|
||||
des_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),sizeof(plain)-12,&ks,
|
||||
des_cfb64_encrypt(plain,cfb_buf1,12,ks,&cfb_tmp,&n,DES_ENCRYPT);
|
||||
des_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),sizeof(plain)-12,ks,
|
||||
&cfb_tmp,&n,DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
|
||||
{
|
||||
|
@ -890,9 +892,9 @@ static int cfb64_test(unsigned char *cfb_cipher)
|
|||
}
|
||||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
n=0;
|
||||
des_cfb64_encrypt(cfb_buf1,cfb_buf2,17,&ks,&cfb_tmp,&n,DES_DECRYPT);
|
||||
des_cfb64_encrypt(cfb_buf1,cfb_buf2,17,ks,&cfb_tmp,&n,DES_DECRYPT);
|
||||
des_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
|
||||
sizeof(plain)-17,&ks,&cfb_tmp,&n,DES_DECRYPT);
|
||||
sizeof(plain)-17,ks,&cfb_tmp,&n,DES_DECRYPT);
|
||||
if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
|
||||
{
|
||||
err=1;
|
||||
|
@ -911,10 +913,10 @@ static int ede_cfb64_test(unsigned char *cfb_cipher)
|
|||
DES_set_key_checked(&cfb_key,&ks);
|
||||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
n=0;
|
||||
des_ede3_cfb64_encrypt(plain,cfb_buf1,12,&ks,&ks,&ks,&cfb_tmp,&n,
|
||||
des_ede3_cfb64_encrypt(plain,cfb_buf1,12,ks,ks,ks,&cfb_tmp,&n,
|
||||
DES_ENCRYPT);
|
||||
des_ede3_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
|
||||
sizeof(plain)-12,&ks,&ks,&ks,
|
||||
sizeof(plain)-12,ks,ks,ks,
|
||||
&cfb_tmp,&n,DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
|
||||
{
|
||||
|
@ -925,10 +927,10 @@ static int ede_cfb64_test(unsigned char *cfb_cipher)
|
|||
}
|
||||
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
|
||||
n=0;
|
||||
des_ede3_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,&ks,&ks,&ks,
|
||||
des_ede3_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,ks,ks,ks,
|
||||
&cfb_tmp,&n,DES_DECRYPT);
|
||||
des_ede3_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
|
||||
sizeof(plain)-17,&ks,&ks,&ks,
|
||||
sizeof(plain)-17,ks,ks,ks,
|
||||
&cfb_tmp,&n,DES_DECRYPT);
|
||||
if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue