projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring des_locl.h at the same level as in the 0.9.7 branch.
[openssl.git]
/
crypto
/
des
/
destest.c
diff --git
a/crypto/des/destest.c
b/crypto/des/destest.c
index d84676df4219a903993dceb9237718a4cd01b38c..7799e6e4bf5a25ca3a36c612bb437cbc6c57d57d 100644
(file)
--- a/
crypto/des/destest.c
+++ b/
crypto/des/destest.c
@@
-56,25
+56,26
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
-#if defined(WIN32) || defined(WIN16) || defined(WINDOWS)
-#ifndef MSDOS
-#define MSDOS
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <openssl/e_os2.h>
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS)
+#ifndef OPENSSL_SYS_MSDOS
+#define OPENSSL_SYS_MSDOS
#endif
#endif
#endif
#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef MSDOS
-#if !defined(VMS) || defined(__DECC)
-#include <openssl/opensslconf.h>
+#ifndef OPENSSL_SYS_MSDOS
+#if !defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VMS_DECC)
#include OPENSSL_UNISTD
#include OPENSSL_UNISTD
-#endif
/* VMS */
+#endif
#else
#include <io.h>
#endif
#include <string.h>
#else
#include <io.h>
#endif
#include <string.h>
-#ifdef NO_DES
+#ifdef
OPENSSL_
NO_DES
int main(int argc, char *argv[])
{
printf("No DES support\n");
int main(int argc, char *argv[])
{
printf("No DES support\n");
@@
-83,9
+84,7
@@
int main(int argc, char *argv[])
#else
#include <openssl/des.h>
#else
#include <openssl/des.h>
-#if defined(PERL5) || defined(__FreeBSD__)
#define crypt(c,s) (des_crypt((c),(s)))
#define crypt(c,s) (des_crypt((c),(s)))
-#endif
/* tisk tisk - the test keys don't all have odd parity :-( */
/* test data */
/* tisk tisk - the test keys don't all have odd parity :-( */
/* test data */
@@
-234,7
+233,6
@@
static unsigned char cipher_ecb2[NUM_TESTS-1][8]={
{0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}};
static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
{0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}};
static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-/* static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87}; */
static unsigned char cbc2_key[8]={0xf1,0xe0,0xd3,0xc2,0xb5,0xa4,0x97,0x86};
static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
static unsigned char cbc_iv [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
static unsigned char cbc2_key[8]={0xf1,0xe0,0xd3,0xc2,0xb5,0xa4,0x97,0x86};
static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
static unsigned char cbc_iv [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
@@
-255,12
+253,24
@@
static unsigned char cbc_ok[32]={
0x46,0x8e,0x91,0x15,0x78,0x88,0xba,0x68,
0x1d,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
0x46,0x8e,0x91,0x15,0x78,0x88,0xba,0x68,
0x1d,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
+#ifdef SCREW_THE_PARITY
+#error "SCREW_THE_PARITY is not ment to be defined."
+#error "Original vectors are preserved for reference only."
+static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
static unsigned char xcbc_ok[32]={
0x86,0x74,0x81,0x0D,0x61,0xA4,0xA5,0x48,
0xB9,0x93,0x03,0xE1,0xB8,0xBB,0xBD,0xBD,
0x64,0x30,0x0B,0xB9,0x06,0x65,0x81,0x76,
0x04,0x1D,0x77,0x62,0x17,0xCA,0x2B,0xD2,
};
static unsigned char xcbc_ok[32]={
0x86,0x74,0x81,0x0D,0x61,0xA4,0xA5,0x48,
0xB9,0x93,0x03,0xE1,0xB8,0xBB,0xBD,0xBD,
0x64,0x30,0x0B,0xB9,0x06,0x65,0x81,0x76,
0x04,0x1D,0x77,0x62,0x17,0xCA,0x2B,0xD2,
};
+#else
+static unsigned char xcbc_ok[32]={
+ 0x84,0x6B,0x29,0x14,0x85,0x1E,0x9A,0x29,
+ 0x54,0x73,0x2F,0x8A,0xA0,0xA6,0x11,0xC1,
+ 0x15,0xCD,0xC2,0xD7,0x95,0x1B,0x10,0x53,
+ 0xA6,0x3C,0x5E,0x03,0xB2,0x1A,0xA3,0xC4,
+ };
+#endif
static unsigned char cbc3_ok[32]={
0x3F,0xE3,0x01,0xC9,0x62,0xAC,0x01,0xD0,
static unsigned char cbc3_ok[32]={
0x3F,0xE3,0x01,0xC9,0x62,0xAC,0x01,0xD0,
@@
-325,24
+335,31
@@
int main(int argc, char *argv[])
unsigned char cbc_in[40];
unsigned char cbc_out[40];
DES_LONG cs;
unsigned char cbc_in[40];
unsigned char cbc_out[40];
DES_LONG cs;
- unsigned char qret[4][4],cret[8];
- DES_LONG lqret[4];
+ unsigned char cret[8];
+#ifdef _CRAY
+ struct {
+ int a:32;
+ int b:32;
+ } lqret[2];
+#else
+ DES_LONG lqret[4];
+#endif
int num;
char *str;
int num;
char *str;
-#ifndef NO_DESCBCM
+#ifndef
OPENSSL_
NO_DESCBCM
printf("Doing cbcm\n");
printf("Doing cbcm\n");
- if ((j=
des_set_key_checked(&cbc_key,
ks)) != 0)
+ if ((j=
DES_set_key_checked(&cbc_key,&
ks)) != 0)
{
printf("Key error %d\n",j);
err=1;
}
{
printf("Key error %d\n",j);
err=1;
}
- if ((j=
des_set_key_checked(&cbc2_key,
ks2)) != 0)
+ if ((j=
DES_set_key_checked(&cbc2_key,&
ks2)) != 0)
{
printf("Key error %d\n",j);
err=1;
}
{
printf("Key error %d\n",j);
err=1;
}
- if ((j=
des_set_key_checked(&cbc3_key,
ks3)) != 0)
+ if ((j=
DES_set_key_checked(&cbc3_key,&
ks3)) != 0)
{
printf("Key error %d\n",j);
err=1;
{
printf("Key error %d\n",j);
err=1;
@@
-354,9
+371,9
@@
int main(int argc, char *argv[])
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
memset(iv2,'\0',sizeof iv2);
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
memset(iv2,'\0',sizeof iv2);
-
des_ede3_cbcm_encrypt(cbc_data,cbc_out,16L,ks,ks2,
ks3,&iv3,&iv2,
+
DES_ede3_cbcm_encrypt(cbc_data,cbc_out,16L,&ks,&ks2,&
ks3,&iv3,&iv2,
DES_ENCRYPT);
DES_ENCRYPT);
-
des_ede3_cbcm_encrypt(&cbc_data[16],&cbc_out[16],i-16,ks,ks2,
ks3,
+
DES_ede3_cbcm_encrypt(&cbc_data[16],&cbc_out[16],i-16,&ks,&ks2,&
ks3,
&iv3,&iv2,DES_ENCRYPT);
/* if (memcmp(cbc_out,cbc3_ok,
(unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
&iv3,&iv2,DES_ENCRYPT);
/* if (memcmp(cbc_out,cbc3_ok,
(unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
@@
-367,7
+384,7
@@
int main(int argc, char *argv[])
*/
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
memset(iv2,'\0',sizeof iv2);
*/
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
memset(iv2,'\0',sizeof iv2);
-
des_ede3_cbcm_encrypt(cbc_out,cbc_in,i,ks,ks2,
ks3,&iv3,&iv2,DES_DECRYPT);
+
DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&
ks3,&iv3,&iv2,DES_DECRYPT);
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
{
int n;
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
{
int n;
@@
-386,7
+403,7
@@
int main(int argc, char *argv[])
printf("Doing ecb\n");
for (i=0; i<NUM_TESTS; i++)
{
printf("Doing ecb\n");
for (i=0; i<NUM_TESTS; i++)
{
-
des_set_key_unchecked(&key_data[i],
ks);
+
DES_set_key_unchecked(&key_data[i],&
ks);
memcpy(in,plain_data[i],8);
memset(out,0,8);
memset(outin,0,8);
memcpy(in,plain_data[i],8);
memset(out,0,8);
memset(outin,0,8);
@@
-412,9
+429,9
@@
int main(int argc, char *argv[])
printf("Doing ede ecb\n");
for (i=0; i<(NUM_TESTS-1); i++)
{
printf("Doing ede ecb\n");
for (i=0; i<(NUM_TESTS-1); i++)
{
-
des_set_key_unchecked(&key_data[i],
ks);
-
des_set_key_unchecked(&key_data[i+1],
ks2);
-
des_set_key_unchecked(&key_data[i+2],
ks3);
+
DES_set_key_unchecked(&key_data[i],&
ks);
+
DES_set_key_unchecked(&key_data[i+1],&
ks2);
+
DES_set_key_unchecked(&key_data[i+2],&
ks3);
memcpy(in,plain_data[i],8);
memset(out,0,8);
memset(outin,0,8);
memcpy(in,plain_data[i],8);
memset(out,0,8);
memset(outin,0,8);
@@
-438,7
+455,7
@@
int main(int argc, char *argv[])
#endif
printf("Doing cbc\n");
#endif
printf("Doing cbc\n");
- if ((j=
des_set_key_checked(&cbc_key,
ks)) != 0)
+ if ((j=
DES_set_key_checked(&cbc_key,&
ks)) != 0)
{
printf("Key error %d\n",j);
err=1;
{
printf("Key error %d\n",j);
err=1;
@@
-465,7
+482,7
@@
int main(int argc, char *argv[])
#ifndef LIBDES_LIT
printf("Doing desx cbc\n");
#ifndef LIBDES_LIT
printf("Doing desx cbc\n");
- if ((j=
des_set_key_checked(&cbc_key,
ks)) != 0)
+ if ((j=
DES_set_key_checked(&cbc_key,&
ks)) != 0)
{
printf("Key error %d\n",j);
err=1;
{
printf("Key error %d\n",j);
err=1;
@@
-491,17
+508,17
@@
int main(int argc, char *argv[])
#endif
printf("Doing ede cbc\n");
#endif
printf("Doing ede cbc\n");
- if ((j=
des_set_key_checked(&cbc_key,
ks)) != 0)
+ if ((j=
DES_set_key_checked(&cbc_key,&
ks)) != 0)
{
printf("Key error %d\n",j);
err=1;
}
{
printf("Key error %d\n",j);
err=1;
}
- if ((j=
des_set_key_checked(&cbc2_key,
ks2)) != 0)
+ if ((j=
DES_set_key_checked(&cbc2_key,&
ks2)) != 0)
{
printf("Key error %d\n",j);
err=1;
}
{
printf("Key error %d\n",j);
err=1;
}
- if ((j=
des_set_key_checked(&cbc3_key,
ks3)) != 0)
+ if ((j=
DES_set_key_checked(&cbc3_key,&
ks3)) != 0)
{
printf("Key error %d\n",j);
err=1;
{
printf("Key error %d\n",j);
err=1;
@@
-512,13
+529,22
@@
int main(int argc, char *argv[])
/* i=((i+7)/8)*8; */
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
/* 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_ENCRYPT);
+ 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,
&iv3,DES_ENCRYPT);
if (memcmp(cbc_out,cbc3_ok,
(unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
{
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)
{
+ int n;
+
printf("des_ede3_cbc_encrypt encrypt error\n");
printf("des_ede3_cbc_encrypt encrypt error\n");
+ for(n=0 ; n < i ; ++n)
+ printf(" %02x",cbc_out[n]);
+ printf("\n");
+ for(n=0 ; n < i ; ++n)
+ printf(" %02x",cbc3_ok[n]);
+ printf("\n");
err=1;
}
err=1;
}
@@
-526,13
+552,21
@@
int main(int argc, char *argv[])
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)
{
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;
+
printf("des_ede3_cbc_encrypt decrypt error\n");
printf("des_ede3_cbc_encrypt decrypt error\n");
+ for(n=0 ; n < i ; ++n)
+ printf(" %02x",cbc_data[n]);
+ printf("\n");
+ for(n=0 ; n < i ; ++n)
+ printf(" %02x",cbc_in[n]);
+ printf("\n");
err=1;
}
#ifndef LIBDES_LIT
printf("Doing pcbc\n");
err=1;
}
#ifndef LIBDES_LIT
printf("Doing pcbc\n");
- if ((j=
des_set_key_checked(&cbc_key,
ks)) != 0)
+ if ((j=
DES_set_key_checked(&cbc_key,&
ks)) != 0)
{
printf("Key error %d\n",j);
err=1;
{
printf("Key error %d\n",j);
err=1;
@@
-595,7
+629,7
@@
int main(int argc, char *argv[])
printf("done\n");
printf("Doing ofb\n");
printf("done\n");
printf("Doing ofb\n");
-
des_set_key_checked(&ofb_key,
ks);
+
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);
if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
des_ofb_encrypt(plain,ofb_buf1,64,sizeof(plain)/8,ks,&ofb_tmp);
if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
@@
-624,7
+658,7
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
}
printf("Doing ofb64\n");
}
printf("Doing ofb64\n");
-
des_set_key_checked(&ofb_key,
ks);
+
DES_set_key_checked(&ofb_key,&
ks);
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
memset(ofb_buf1,0,sizeof(ofb_buf1));
memset(ofb_buf2,0,sizeof(ofb_buf1));
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
memset(ofb_buf1,0,sizeof(ofb_buf1));
memset(ofb_buf2,0,sizeof(ofb_buf1));
@@
-641,7
+675,8
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
}
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
num=0;
}
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
num=0;
- des_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,&ofb_tmp,&num);
+ des_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,&ofb_tmp,
+ &num);
if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
{
printf("ofb64_encrypt decrypt error\n");
if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
{
printf("ofb64_encrypt decrypt error\n");
@@
-649,15
+684,15
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
}
printf("Doing ede_ofb64\n");
}
printf("Doing ede_ofb64\n");
-
des_set_key_checked(&ofb_key,
ks);
+
DES_set_key_checked(&ofb_key,&
ks);
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
memset(ofb_buf1,0,sizeof(ofb_buf1));
memset(ofb_buf2,0,sizeof(ofb_buf1));
num=0;
for (i=0; i<sizeof(plain); i++)
{
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
memset(ofb_buf1,0,sizeof(ofb_buf1));
memset(ofb_buf2,0,sizeof(ofb_buf1));
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)
{
}
if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
{
@@
-666,8
+701,8
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
}
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
num=0;
}
memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
num=0;
- des_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,
-
ks,ks,
&ofb_tmp,&num);
+ 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)
{
printf("ede_ofb64_encrypt decrypt error\n");
if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
{
printf("ede_ofb64_encrypt decrypt error\n");
@@
-675,7
+710,7
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
}
printf("Doing cbc_cksum\n");
}
printf("Doing cbc_cksum\n");
-
des_set_key_checked(&cbc_key,
ks);
+
DES_set_key_checked(&cbc_key,&
ks);
cs=des_cbc_cksum(cbc_data,&cret,strlen((char *)cbc_data),ks,&cbc_iv);
if (cs != cbc_cksum_ret)
{
cs=des_cbc_cksum(cbc_data,&cret,strlen((char *)cbc_data),ks,&cbc_iv);
if (cs != cbc_cksum_ret)
{
@@
-690,43
+725,40
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
}
printf("Doing quad_cksum\n");
}
printf("Doing quad_cksum\n");
- /* This is obviously done this way especially to puzzle me. Although
- quad_cksum returns up to 4 groups of 8 bytes, this test gets it to
- produce 2 groups then treats them as 4 groups of 4 bytes.
- Ben 13 Feb 1999 */
- cs=quad_cksum(cbc_data,(des_cblock *)qret,strlen((char *)cbc_data),2,
- &cbc_iv);
-
- { /* Big-endian fix */
- static DES_LONG l=1;
- static unsigned char *c=(unsigned char *)&l;
- DES_LONG ll;
-
- j=sizeof(lqret[0])-4;
- for (i=0; i<4; i++)
+ cs=des_quad_cksum(cbc_data,(des_cblock *)lqret,
+ (long)strlen((char *)cbc_data),2,(des_cblock *)cbc_iv);
+ if (cs != 0x70d7a63aL)
{
{
- lqret[i]=0;
- memcpy(&(lqret[i]),&(qret[i][0]),4);
- if (!c[0] && (j > 0))
- lqret[i]=lqret[i]>>(j*8); /* For Cray */
+ printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
+ (unsigned long)cs);
+ err=1;
}
}
-
- if (
!c[0]
)
+#ifdef _CRAY
+ if (
lqret[0].a != 0x327eba8dL
)
{
{
- ll=lqret[0]^lqret[3];
- lqret[0]^=ll;
- lqret[3]^=ll;
- ll=lqret[1]^lqret[2];
- lqret[1]^=ll;
- lqret[2]^=ll;
+ printf("quad_cksum error, out[0] %08lx is not %08lx\n",
+ (unsigned long)lqret[0].a,0x327eba8dUL);
+ err=1;
}
}
- }
- if (cs != 0x70d7a63aL)
+ if (lqret[0].b != 0x201a49ccL)
{
{
- printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
- (unsigned long)cs);
+ printf("quad_cksum error, out[1] %08lx is not %08lx\n",
+ (unsigned long)lqret[0].b,0x201a49ccUL);
+ err=1;
+ }
+ if (lqret[1].a != 0x70d7a63aL)
+ {
+ printf("quad_cksum error, out[2] %08lx is not %08lx\n",
+ (unsigned long)lqret[1].a,0x70d7a63aUL);
+ err=1;
+ }
+ if (lqret[1].b != 0x501c2c26L)
+ {
+ printf("quad_cksum error, out[3] %08lx is not %08lx\n",
+ (unsigned long)lqret[1].b,0x501c2c26UL);
err=1;
}
err=1;
}
+#else
if (lqret[0] != 0x327eba8dL)
{
printf("quad_cksum error, out[0] %08lx is not %08lx\n",
if (lqret[0] != 0x327eba8dL)
{
printf("quad_cksum error, out[0] %08lx is not %08lx\n",
@@
-751,6
+783,7
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
(unsigned long)lqret[3],0x501c2c26UL);
err=1;
}
(unsigned long)lqret[3],0x501c2c26UL);
err=1;
}
+#endif
#endif
printf("input word alignment test");
#endif
printf("input word alignment test");
@@
-784,7
+817,7
@@
plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
err=1;
}
printf("\n");
err=1;
}
printf("\n");
-
exit
(err);
+
return
(err);
}
static char *pt(unsigned char *p)
}
static char *pt(unsigned char *p)
@@
-813,7
+846,7
@@
static int cfb_test(int bits, unsigned char *cfb_cipher)
des_key_schedule ks;
int i,err=0;
des_key_schedule ks;
int i,err=0;
-
des_set_key_checked(&cfb_key,
ks);
+
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_ENCRYPT);
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
des_cfb_encrypt(plain,cfb_buf1,bits,sizeof(plain),ks,&cfb_tmp,
DES_ENCRYPT);
@@
-842,7
+875,7
@@
static int cfb64_test(unsigned char *cfb_cipher)
des_key_schedule ks;
int err=0,i,n;
des_key_schedule ks;
int err=0,i,n;
-
des_set_key_checked(&cfb_key,
ks);
+
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);
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
n=0;
des_cfb64_encrypt(plain,cfb_buf1,12,ks,&cfb_tmp,&n,DES_ENCRYPT);
@@
-875,7
+908,7
@@
static int ede_cfb64_test(unsigned char *cfb_cipher)
des_key_schedule ks;
int err=0,i,n;
des_key_schedule ks;
int err=0,i,n;
-
des_set_key_checked(&cfb_key,
ks);
+
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,
memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
n=0;
des_ede3_cfb64_encrypt(plain,cfb_buf1,12,ks,ks,ks,&cfb_tmp,&n,