diff options
author | Andy Polyakov <appro@openssl.org> | 2008-10-31 19:48:25 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2008-10-31 19:48:25 +0000 |
commit | b444ac3e6f04aec13aa0c19983291b0326feb7f9 (patch) | |
tree | 85bcf3b485b770d53f8cd5dffc6efb51429cf436 /crypto/evp/e_xcbc_d.c | |
parent | f768be81d804d0467be4ad7163216c8381872b94 (diff) |
size_t-fy EVP_CIPHER. Note that being size_t-fied it doesn't require
underlying cipher to be size_t-fied, it allows for size_t, signed and
unsigned long. It maintains source and even binary compatibility.
Diffstat (limited to 'crypto/evp/e_xcbc_d.c')
-rw-r--r-- | crypto/evp/e_xcbc_d.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c index 8832da2433..250e88c8c5 100644 --- a/crypto/evp/e_xcbc_d.c +++ b/crypto/evp/e_xcbc_d.c @@ -63,12 +63,13 @@ #include <openssl/evp.h> #include <openssl/objects.h> +#include "evp_locl.h" #include <openssl/des.h> static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv,int enc); static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl); + const unsigned char *in, size_t inl); typedef struct @@ -113,13 +114,25 @@ static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, } static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl) + const unsigned char *in, size_t inl) { - DES_xcbc_encrypt(in,out,inl,&data(ctx)->ks, + while (inl>=EVP_MAXCHUNK) + { + DES_xcbc_encrypt(in,out,(long)EVP_MAXCHUNK,&data(ctx)->ks, (DES_cblock *)&(ctx->iv[0]), &data(ctx)->inw, &data(ctx)->outw, ctx->encrypt); + inl-=EVP_MAXCHUNK; + in +=EVP_MAXCHUNK; + out+=EVP_MAXCHUNK; + } + if (inl) + DES_xcbc_encrypt(in,out,(long)inl,&data(ctx)->ks, + (DES_cblock *)&(ctx->iv[0]), + &data(ctx)->inw, + &data(ctx)->outw, + ctx->encrypt); return 1; } #endif |