 @@ -317,27 +317,27 @@ static unsigned char ofb_cipher[24]=
 #if 0
 static DES_LONG cbc_cksum_ret=0xB462FEF7L;
 #else
 static DES_LONG cbc_cksum_ret=0xF7FE62B4L;
 #endif
 static unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
 static char *pt(unsigned char *p);
 static int cfb_test(int bits, unsigned char *cfb_cipher);
 static int cfb64_test(unsigned char *cfb_cipher);
 static int ede_cfb64_test(unsigned char *cfb_cipher);
 int main(int argc, char *argv[])
+	{
-	int i,j,err=0;
+	int j,err=0;
 	unsigned int i;
 	DES_cblock in,out,outin,iv3,iv2;
 	DES_key_schedule ks,ks2,ks3;
 	unsigned char cbc_in[40];
 	unsigned char cbc_out[40];
 	DES_LONG cs;
 	unsigned char cret[8];
 #ifdef _CRAY
         struct {
             int a:32;
             int b:32;
         } lqret[2];
 #else
 @@ -396,118 +396,118 @@ int main(int argc, char *argv[])
 		    printf(" %02x",cbc_in[n]);
 		printf("\n");
 		err=1;
+		}
 #endif
 	printf("Doing ecb\n");
 	for (i=0; i<NUM_TESTS; i++)
+		{
 		DES_set_key_unchecked(&key_data[i],&ks);
 		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(&in,&out,&ks,DES_ENCRYPT);
-		DES_ecb_encrypt(&out,&outin,ks,DES_DECRYPT);
+		DES_ecb_encrypt(&out,&outin,&ks,DES_DECRYPT);
 		if (memcmp(out,cipher_data[i],8) != 0)
+			{
 			printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
 				i+1,pt(key_data[i]),pt(in),pt(cipher_data[i]),
 				pt(out));
 			err=1;
+			}
 		if (memcmp(in,outin,8) != 0)
+			{
 			printf("Decryption error %2d\nk=%s p=%s o=%s act=%s\n",
 				i+1,pt(key_data[i]),pt(out),pt(in),pt(outin));
 			err=1;
+			}
+		}
 #ifndef LIBDES_LIT
 	printf("Doing ede ecb\n");
 	for (i=0; i<(NUM_TESTS-2); 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);
 		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(&in,&out,&ks,&ks2,DES_ENCRYPT);
-		DES_ecb2_encrypt(&out,&outin,ks,ks2,DES_DECRYPT);
+		DES_ecb2_encrypt(&out,&outin,&ks,&ks2,DES_DECRYPT);
 		if (memcmp(out,cipher_ecb2[i],8) != 0)
+			{
 			printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
 				i+1,pt(key_data[i]),pt(in),pt(cipher_ecb2[i]),
 				pt(out));
 			err=1;
+			}
 		if (memcmp(in,outin,8) != 0)
+			{
 			printf("Decryption error %2d\nk=%s p=%s o=%s act=%s\n",
 				i+1,pt(key_data[i]),pt(out),pt(in),pt(outin));
 			err=1;
+			}
+		}
 #endif
 	printf("Doing cbc\n");
 	if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
+		{
 		printf("Key error %d\n",j);
 		err=1;
+		}
 	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)
+		{
 		printf("cbc_encrypt encrypt error\n");
 		err=1;
+		}
 	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)
+		{
 		printf("cbc_encrypt decrypt error\n");
 		err=1;
+		}
 #ifndef LIBDES_LIT
 	printf("Doing desx cbc\n");
 	if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
+		{
 		printf("Key error %d\n",j);
 		err=1;
+		}
 	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)
+		{
 		printf("DES_xcbc_encrypt encrypt error\n");
 		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)
+		{
 		printf("DES_xcbc_encrypt decrypt error\n");
 		err=1;
+		}
 #endif
 	printf("Doing ede cbc\n");
 	if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
+		{
 		printf("Key error %d\n",j);
 		err=1;
 @@ -518,209 +518,209 @@ int main(int argc, char *argv[])
 		err=1;
+		}
 	if ((j=DES_set_key_checked(&cbc3_key,&ks3)) != 0)
+		{
 		printf("Key error %d\n",j);
 		err=1;
+		}
 	memset(cbc_out,0,40);
 	memset(cbc_in,0,40);
 	i=strlen((char *)cbc_data)+1;
 	/* 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)
+		{
 		int 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;
+		}
 	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;
 		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");
 	if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
+		{
 		printf("Key error %d\n",j);
 		err=1;
+		}
 	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)
+		{
 		printf("pcbc_encrypt decrypt error\n");
 		err=1;
+		}
 	printf("Doing ");
 	printf("cfb8 ");
 	err+=cfb_test(8,cfb_cipher8);
 	printf("cfb16 ");
 	err+=cfb_test(16,cfb_cipher16);
 	printf("cfb32 ");
 	err+=cfb_test(32,cfb_cipher32);
 	printf("cfb48 ");
 	err+=cfb_test(48,cfb_cipher48);
 	printf("cfb64 ");
 	err+=cfb_test(64,cfb_cipher64);
 	printf("cfb64() ");
 	err+=cfb64_test(cfb_cipher64);
 	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
 	for (i=0; i<sizeof(plain); i++)
 		DES_cfb_encrypt(&(plain[i]),&(cfb_buf1[i]),
-,1,ks,&cfb_tmp,DES_ENCRYPT);
+,1,&ks,&cfb_tmp,DES_ENCRYPT);
 	if (memcmp(cfb_cipher8,cfb_buf1,sizeof(plain)) != 0)
+		{
 		printf("cfb_encrypt small encrypt error\n");
 		err=1;
+		}
 	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
 	for (i=0; i<sizeof(plain); i++)
 		DES_cfb_encrypt(&(cfb_buf1[i]),&(cfb_buf2[i]),
-,1,ks,&cfb_tmp,DES_DECRYPT);
+,1,&ks,&cfb_tmp,DES_DECRYPT);
 	if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
+		{
 		printf("cfb_encrypt small decrypt error\n");
 		err=1;
+		}
 	printf("ede_cfb64() ");
 	err+=ede_cfb64_test(cfb_cipher64);
 	printf("done\n");
 	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");
 printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
 ofb_buf1[8+0], ofb_buf1[8+1], ofb_buf1[8+2], ofb_buf1[8+3],
 ofb_buf1[8+4], ofb_buf1[8+5], ofb_buf1[8+6], ofb_buf1[8+7]);
 printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
 ofb_buf1[8+0], ofb_cipher[8+1], ofb_cipher[8+2], ofb_cipher[8+3],
 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");
 printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
 ofb_buf2[8+0], ofb_buf2[8+1], ofb_buf2[8+2], ofb_buf2[8+3],
 ofb_buf2[8+4], ofb_buf2[8+5], ofb_buf2[8+6], ofb_buf2[8+7]);
 printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
 plain[8+0], plain[8+1], plain[8+2], plain[8+3],
 plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
 		err=1;
+		}
 	printf("Doing ofb64\n");
 	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++)
+		{
-		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)
+		{
 		printf("ofb64_encrypt encrypt error\n");
 		err=1;
+		}
 	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)
+		{
 		printf("ofb64_encrypt decrypt error\n");
 		err=1;
+		}
 	printf("Doing ede_ofb64\n");
 	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++)
+		{
-		DES_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,ks,
+		DES_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,&ks,&ks,
-				       ks,&ofb_tmp,&num);
+				       &ks,&ofb_tmp,&num);
+		}
 	if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
+		{
 		printf("ede_ofb64_encrypt encrypt error\n");
 		err=1;
+		}
 	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)
+		{
 		printf("ede_ofb64_encrypt decrypt error\n");
 		err=1;
+		}
 	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",
 			(unsigned long)cs,(unsigned long)cbc_cksum_ret);
 		err=1;
+		}
 	if (memcmp(cret,cbc_cksum_data,8) != 0)
+		{
 		printf("bad cbc_cksum block returned\n");
 		err=1;
+		}
 	printf("Doing quad_cksum\n");
 @@ -780,35 +780,35 @@ plain[8+4], plain[8+5], plain[8+6], plai
+		{
 		printf("quad_cksum error, out[3] %08lx is not %08lx\n",
 			(unsigned long)lqret[3],0x501c2c26UL);
 		err=1;
+		}
 #endif
 #endif
 	printf("input word alignment test");
 	for (i=0; i<4; i++)
+		{
 		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");
 	for (i=0; i<4; i++)
+		{
 		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");
 	printf("fast crypt test ");
 	str=crypt("testing","ef");
 	if (strcmp("efGnQx2725bI2",str) != 0)
+		{
 		printf("fast crypt error, %s should be efGnQx2725bI2\n",str);
 		err=1;
+		}
 	str=crypt("bca76;23","yA");
 	if (strcmp("yA1Rp/1hZXIJk",str) != 0)
+		{
 @@ -840,107 +840,107 @@ static char *pt(unsigned char *p)
 	ret[16]='\0';
 	return(ret);
+	}
 #ifndef LIBDES_LIT
 static int cfb_test(int bits, unsigned char *cfb_cipher)
+	{
 	DES_key_schedule ks;
 	int i,err=0;
 	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)
+		{
 		err=1;
 		printf("cfb_encrypt encrypt error\n");
 		for (i=0; i<24; i+=8)
 			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)
+		{
 		err=1;
 		printf("cfb_encrypt decrypt error\n");
 		for (i=0; i<24; i+=8)
 			printf("%s\n",pt(&(cfb_buf1[i])));
+		}
 	return(err);
+	}
 static int cfb64_test(unsigned char *cfb_cipher)
+	{
 	DES_key_schedule ks;
 	int err=0,i,n;
 	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,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[12]),&(cfb_buf1[12]),sizeof(plain)-12,&ks,
 			  &cfb_tmp,&n,DES_ENCRYPT);
 	if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
+		{
 		err=1;
 		printf("cfb_encrypt encrypt error\n");
 		for (i=0; i<24; i+=8)
 			printf("%s\n",pt(&(cfb_buf1[i])));
+		}
 	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;
 		printf("cfb_encrypt decrypt error\n");
 		for (i=0; i<24; i+=8)
 			printf("%s\n",pt(&(cfb_buf2[i])));
+		}
 	return(err);
+	}
 static int ede_cfb64_test(unsigned char *cfb_cipher)
+	{
 	DES_key_schedule ks;
 	int err=0,i,n;
 	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)
+		{
 		err=1;
 		printf("ede_cfb_encrypt encrypt error\n");
 		for (i=0; i<24; i+=8)
 			printf("%s\n",pt(&(cfb_buf1[i])));
+		}
 	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)
+		{
 		err=1;
 		printf("ede_cfb_encrypt decrypt error\n");
 		for (i=0; i<24; i+=8)
 			printf("%s\n",pt(&(cfb_buf2[i])));
+		}
 	return(err);
+	}
 #endif
 #endif

 @@ -53,44 +53,44 @@
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
 main()
+	{
-	LHASH *conf;
+	LHASH_OF(CONF_VALUE) *conf;
 	long eline;
 	char *s,*s2;
 #ifdef USE_WIN32
 	CONF_set_default_method(CONF_WIN32);
 #endif
 	conf=CONF_load(NULL,"ssleay.cnf",&eline);
 	if (conf == NULL)
+		{
 		ERR_load_crypto_strings();
 		printf("unable to load configuration, line %ld\n",eline);
 		ERR_print_errors_fp(stderr);
 		exit(1);
+		}
-	lh_stats(conf,stdout);
+	lh_stats((_LHASH *)conf,stdout);
-	lh_node_stats(conf,stdout);
+	lh_node_stats((_LHASH *)conf,stdout);
-	lh_node_usage_stats(conf,stdout);
+	lh_node_usage_stats((_LHASH *)conf,stdout);
 	s=CONF_get_string(conf,NULL,"init2");
 	printf("init2=%s\n",(s == NULL)?"NULL":s);
 	s=CONF_get_string(conf,NULL,"cipher1");
 	printf("cipher1=%s\n",(s == NULL)?"NULL":s);
 	s=CONF_get_string(conf,"s_client","cipher1");
 	printf("s_client:cipher1=%s\n",(s == NULL)?"NULL":s);
 	printf("---------------------------- DUMP ------------------------\n");
 	CONF_dump_fp(conf, stdout);

 @@ -53,27 +53,27 @@
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/lhash.h>
 main()
+	{
-	LHASH *conf;
+	_LHASH *conf;
 	char buf[256];
 	int i;
 	conf=lh_new(lh_strhash,(int (*)(const void *, const void *))strcmp);
 	for (;;)
+		{
 		char *p;
 		buf[0]='\0';
 		fgets(buf,256,stdin);
 		if (buf[0] == '\0') break;
 		i=strlen(buf);
 		p=OPENSSL_malloc(i+1);

 @@ -127,17 +127,17 @@ int main(int argc, char *argv[])
 #ifdef OPENSSL_SYS_NETWARE
     if (err) printf("ERROR: %d\n", err);
 #endif
 	EXIT(err);
 	return err;
+	}
 static char *pt(unsigned char *md)
+	{
 	int i;
 	static char buf[80];
 	for (i=0; i<MD2_DIGEST_LENGTH; i++)
-		snprintf(&(buf[i*2]),, sizeof(buf) - i * 2, "%02x",md[i]);
+		snprintf(&(buf[i*2]), sizeof(buf) - i * 2, "%02x",md[i]);
 	return(buf);
+	}
 #endif

	@@ -338,31 +338,31 @@ end:		@@ -338,31 +338,31 @@ end:
338	if (c_ctx != NULL)	338	if (c_ctx != NULL)
339	{	339	{
340	fprintf(stderr,"Client SSL_CTX stats then free it\n");	340	fprintf(stderr,"Client SSL_CTX stats then free it\n");
341	print_stats(stderr,c_ctx);	341	print_stats(stderr,c_ctx);
342	SSL_CTX_free(c_ctx);	342	SSL_CTX_free(c_ctx);
343	}	343	}
344	if (s_ctx != NULL)	344	if (s_ctx != NULL)
345	{	345	{
346	fprintf(stderr,"Server SSL_CTX stats then free it\n");	346	fprintf(stderr,"Server SSL_CTX stats then free it\n");
347	print_stats(stderr,s_ctx);	347	print_stats(stderr,s_ctx);
348	if (cache_stats)	348	if (cache_stats)
349	{	349	{
350	fprintf(stderr,"-----\n");	350	fprintf(stderr,"-----\n");
351	lh_stats(SSL_CTX_sessions(s_ctx),stderr);	351	lh_stats((_LHASH *)SSL_CTX_sessions(s_ctx),stderr);
352	fprintf(stderr,"-----\n");	352	fprintf(stderr,"-----\n");
353	/* lh_node_stats(SSL_CTX_sessions(s_ctx),stderr);	353	/* lh_node_stats((_LHASH *)SSL_CTX_sessions(s_ctx),stderr);
354	fprintf(stderr,"-----\n"); */	354	fprintf(stderr,"-----\n"); */
355	lh_node_usage_stats(SSL_CTX_sessions(s_ctx),stderr);	355	lh_node_usage_stats((_LHASH *)SSL_CTX_sessions(s_ctx),stderr);
356	fprintf(stderr,"-----\n");	356	fprintf(stderr,"-----\n");
357	}	357	}
358	SSL_CTX_free(s_ctx);	358	SSL_CTX_free(s_ctx);
359	fprintf(stderr,"done free\n");	359	fprintf(stderr,"done free\n");
360	}	360	}
361	exit(ret);	361	exit(ret);
362	return(0);	362	return(0);
363	}	363	}
364		364
365	#define W_READ 1	365	#define W_READ 1
366	#define W_WRITE 2	366	#define W_WRITE 2
367	#define C_DONE 1	367	#define C_DONE 1
368	#define S_DONE 2	368	#define S_DONE 2

 @@ -59,27 +59,27 @@
 /* Simple program to check the ext_dat.h is correct and print out
  * problems if it is not.
  */
 #include <stdio.h>
 #include <openssl/x509v3.h>
 #include "ext_dat.h"
 main()
+{
 	int i, prev = -1, bad = 0;
-	X509V3_EXT_METHOD **tmp;
+	const X509V3_EXT_METHOD **tmp;
 	i = sizeof(standard_exts) / sizeof(X509V3_EXT_METHOD *);
 	if(i != STANDARD_EXTENSION_COUNT)
 		fprintf(stderr, "Extension number invalid expecting %d\n", i);
 	tmp = standard_exts;
 	for(i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++) {
 		if((*tmp)->ext_nid < prev) bad = 1;
 		prev = (*tmp)->ext_nid;
+	}
 	if(bad) {
 		tmp = standard_exts;
 		fprintf(stderr, "Extensions out of order!\n");
 		for(i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++)