diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-08-13 18:04:04 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-08-13 18:04:04 +0000 |
| commit | 27ad06a62735702b9702a605086b155a20557c5f (patch) | |
| tree | 312c065c30f098b0eef7ccf67452e475eb87b4d0 /crypto/des/cbc3_enc.c | |
| parent | cab161c85f6ac468450d368eef6b61f8ed725da7 (diff) | |
Compile pkcs7 and des apps.
Diffstat (limited to 'crypto/des/cbc3_enc.c')
| -rw-r--r-- | crypto/des/cbc3_enc.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/crypto/des/cbc3_enc.c b/crypto/des/cbc3_enc.c index 3863a676d4..527e74f3de 100644 --- a/crypto/des/cbc3_enc.c +++ b/crypto/des/cbc3_enc.c @@ -58,7 +58,7 @@ #include "des_locl.h" -/* HAS BUGS? DON'T USE - this is only present for use in des.c */ +/* HAS BUGS! DON'T USE - this is only present for use in des.c */ void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length, des_key_schedule ks1, des_key_schedule ks2, des_cblock *iv1, des_cblock *iv2, int enc) @@ -69,11 +69,14 @@ void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length, if (enc == DES_ENCRYPT) { - des_cbc_encrypt(input,output,length,ks1,iv1,enc); + des_cbc_encrypt((unsigned char*)input, + (unsigned char*)output,length,ks1,iv1,enc); if (length >= sizeof(des_cblock)) memcpy(niv1,output[off],sizeof(des_cblock)); - des_cbc_encrypt(output,output,l8,ks2,iv1,!enc); - des_cbc_encrypt(output,output,l8,ks1,iv2, enc); + des_cbc_encrypt((unsigned char*)output, + (unsigned char*)output,l8,ks2,iv1,!enc); + des_cbc_encrypt((unsigned char*)output, + (unsigned char*)output,l8,ks1,iv2,enc); if (length >= sizeof(des_cblock)) memcpy(niv2,output[off],sizeof(des_cblock)); } @@ -81,11 +84,14 @@ void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length, { if (length >= sizeof(des_cblock)) memcpy(niv2,input[off],sizeof(des_cblock)); - des_cbc_encrypt(input,output,l8,ks1,iv2,enc); - des_cbc_encrypt(output,output,l8,ks2,iv1,!enc); + des_cbc_encrypt((unsigned char*)input, + (unsigned char*)output,l8,ks1,iv2,enc); + des_cbc_encrypt((unsigned char*)output, + (unsigned char*)output,l8,ks2,iv1,!enc); if (length >= sizeof(des_cblock)) memcpy(niv1,output[off],sizeof(des_cblock)); - des_cbc_encrypt(output,output,length,ks1,iv1, enc); + des_cbc_encrypt((unsigned char*)output, + (unsigned char*)output,length,ks1,iv1,enc); } memcpy(*iv1,niv1,sizeof(des_cblock)); memcpy(*iv2,niv2,sizeof(des_cblock)); |