Here are some patches for some files. Some files are unused (not in makefiles,
but in snapshot). All diffs are on "diff -tBHu3" format against 19-Aug snapshot.
+++ ./crypto/des/cbc3_enc.c Tue Jul 31 10:13:42 2001
--- ./crypto/des/cbc3_enc.old Fri Aug 13 18:00:24 1999
@@ -70,13 +70,13 @@
if (enc == DES_ENCRYPT)
{
des_cbc_encrypt((unsigned char*)input,
+ (unsigned char*)output,length,&ks1,iv1,enc);
- (unsigned char*)output,length,ks1,iv1,enc);
if (length >= sizeof(des_cblock))
memcpy(niv1,output[off],sizeof(des_cblock));
des_cbc_encrypt((unsigned char*)output,
+ (unsigned char*)output,l8,&ks2,iv1,!enc);
- (unsigned char*)output,l8,ks2,iv1,!enc);
des_cbc_encrypt((unsigned char*)output,
+ (unsigned char*)output,l8,&ks1,iv2,enc);
- (unsigned char*)output,l8,ks1,iv2,enc);
if (length >= sizeof(des_cblock))
memcpy(niv2,output[off],sizeof(des_cblock));
}
@@ -85,13 +85,13 @@
if (length >= sizeof(des_cblock))
memcpy(niv2,input[off],sizeof(des_cblock));
des_cbc_encrypt((unsigned char*)input,
+ (unsigned char*)output,l8,&ks1,iv2,enc);
- (unsigned char*)output,l8,ks1,iv2,enc);
des_cbc_encrypt((unsigned char*)output,
+ (unsigned char*)output,l8,&ks2,iv1,!enc);
- (unsigned char*)output,l8,ks2,iv1,!enc);
if (length >= sizeof(des_cblock))
memcpy(niv1,output[off],sizeof(des_cblock));
des_cbc_encrypt((unsigned char*)output,
+ (unsigned char*)output,length,&ks1,iv1,enc);
- (unsigned char*)output,length,ks1,iv1,enc);
}
memcpy(*iv1,niv1,sizeof(des_cblock));
memcpy(*iv2,niv2,sizeof(des_cblock));
+++ ./crypto/des/des.c Tue Jul 31 10:50:54 2001
--- ./crypto/des/des.old Mon May 14 11:00:20 2001
@@ -423,7 +423,7 @@
else
k2[i-8]=k;
}
+ des_set_key_unchecked(&k2,&ks2);
- des_set_key_unchecked(&k2,ks2);
memset(k2,0,sizeof(k2));
}
else if (longk || flag3)
@@ -431,7 +431,7 @@
if (flag3)
{
des_string_to_2keys(key,&kk,&k2);
+ des_set_key_unchecked(&k2,&ks2);
- des_set_key_unchecked(&k2,ks2);
memset(k2,0,sizeof(k2));
}
else
@@ -453,7 +453,7 @@
kk[i]=key[i]|0x80;
}
+ des_set_key_unchecked(&kk,&ks);
- des_set_key_unchecked(&kk,ks);
memset(key,0,sizeof(key));
memset(kk,0,sizeof(kk));
/* woops - A bug that does not showup under unix :-( */
@@ -493,7 +493,7 @@
if (cflag)
{
des_cbc_cksum(buf,&cksum,
+ (long)len,&ks,&cksum);
- (long)len,ks,&cksum);
if (!eflag)
{
if (feof(DES_IN)) break;
@@ -506,13 +506,13 @@
des_ecb_encrypt(
(des_cblock *)&(buf[i]),
(des_cblock *)&(obuf[i]),
+ &ks,do_encrypt);
- ks,do_encrypt);
else if (flag3 && bflag)
for (i=0; i<l; i+=8)
des_ecb2_encrypt(
(des_cblock *)&(buf[i]),
(des_cblock *)&(obuf[i]),
+ &ks,&ks2,do_encrypt);
- ks,ks2,do_encrypt);
else if (flag3 && !bflag)
{
char tmpbuf[8];
@@ -530,7 +530,7 @@
{
des_cbc_encrypt(
buf,obuf,
+ (long)l,&ks,&iv,do_encrypt);
- (long)l,ks,&iv,do_encrypt);
if (l >= 8) memcpy(iv,&(obuf[l-8]),8);
}
if (rem) memcpy(buf,&(buf[l]),(unsigned int)rem);
@@ -585,13 +585,13 @@
des_ecb_encrypt(
(des_cblock *)&(buf[i]),
(des_cblock *)&(obuf[i]),
+ &ks,do_encrypt);
- ks,do_encrypt);
else if (flag3 && bflag)
for (i=0; i<l; i+=8)
des_ecb2_encrypt(
(des_cblock *)&(buf[i]),
(des_cblock *)&(obuf[i]),
+ &ks,&ks2,do_encrypt);
- ks,ks2,do_encrypt);
else if (flag3 && !bflag)
{
des_3cbc_encrypt(
@@ -603,7 +603,7 @@
{
des_cbc_encrypt(
buf,obuf,
+ (long)l,&ks,&iv,do_encrypt);
- (long)l,ks,&iv,do_encrypt);
if (l >= 8) memcpy(iv,&(buf[l-8]),8);
}
@@ -629,7 +629,7 @@
}
i=0;
if (cflag) des_cbc_cksum(obuf,
+ (des_cblock *)cksum,(long)l/8*8,&ks,
- (des_cblock *)cksum,(long)l/8*8,ks,
(des_cblock *)cksum);
while (i != l)
{
@@ -665,8 +665,8 @@
problems:
memset(buf,0,sizeof(buf));
memset(obuf,0,sizeof(obuf));
+ memset(&ks,0,sizeof(ks));
+ memset(&ks2,0,sizeof(ks2));
- memset(ks,0,sizeof(ks));
- memset(ks2,0,sizeof(ks2));
memset(iv,0,sizeof(iv));
memset(iv2,0,sizeof(iv2));
memset(kk,0,sizeof(kk));
+++ ./crypto/dsa/dsagen.c Tue Jul 31 10:53:32 2001
--- ./crypto/dsa/dsagen.old Fri Apr 23 22:00:30 1999
@@ -103,7 +103,7 @@
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
memcpy(seed_buf,seed,20);
+ dsa=DSA_generate_parameters(1024,seed,20,&counter,&h,cb,bio_err);
- dsa=DSA_generate_parameters(1024,seed,20,&counter,&h,cb);
if (dsa == NULL)
DSA_print(bio_err,dsa,0);
+++ ./crypto/x509v3/v3conf.c Tue Jul 31 10:57:04 2001
--- ./crypto/x509v3/v3conf.old Fri Dec 8 19:01:22 2000
@@ -118,7 +118,7 @@
printf("%s", OBJ_nid2ln(OBJ_obj2nid(ext->object)));
if(ext->critical) printf(",critical:\n");
else printf(":\n");
+ X509V3_EXT_print_fp(stdout, ext, 0, 0);
- X509V3_EXT_print_fp(stdout, ext, 0);
printf("\n");
}
+++ ./demos/maurice/loadkeys.c Fri Aug 3 12:38:58 2001
--- ./demos/maurice/loadkeys.old Fri Apr 23 22:00:50 1999
@@ -33,7 +33,7 @@
x509 = (X509 *)PEM_ASN1_read ((char *(*)())d2i_X509,
PEM_STRING_X509,
+ fp, NULL, NULL, NULL);
- fp, NULL, NULL);
if (x509 == NULL)
{
@@ -64,7 +64,7 @@
pkey = (EVP_PKEY*)PEM_ASN1_read ((char *(*)())d2i_PrivateKey,
PEM_STRING_EVP_PKEY,
fp,
+ NULL, NULL, NULL);
- NULL, NULL);
fclose (fp);
+++ ./demos/sign/sign.c Fri Nov 3 11:31:06 2000
--- ./demos/sign/sign.old Wed Jun 9 23:00:58 1999
@@ -122,7 +122,7 @@
fp = fopen (certfile, "r");
if (fp == NULL) exit (1);
- x509 = PEM_read_X509(fp, NULL, NULL, NULL);
+ x509 = PEM_read_X509(fp, NULL, NULL);
fclose (fp);
if (x509 == NULL) {
--------------------------------------
Gisle V.
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
