oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Do incremental encryption.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23641 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-19 02:20:14 +00:00
parent 6fe6bf3eef
commit c6f0b74fe5
1 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/hcrypto/evp.c
View File

@@ -831,8 +831,10 @@ int
EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, void *out, int *outlen, EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, void *out, int *outlen,
void *in, size_t inlen) void *in, size_t inlen)
{ {
int ret; int ret, left, blocksize;
*outlen = 0;
/** /**
* If there in no spare bytes in the left from last Update and the * If there in no spare bytes in the left from last Update and the
* input length is on the block boundery, the EVP_CipherUpdate() * input length is on the block boundery, the EVP_CipherUpdate()
@@ -848,8 +850,50 @@ EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, void *out, int *outlen,
*outlen = 0; *outlen = 0;
return ret; return ret;
} }
ctx->buf_len += (inlen & ctx->block_mask);
return 0;
blocksize = EVP_CIPHER_CTX_block_size(ctx);
left = blocksize - ctx->buf_len;
assert(left > 0);
if (ctx->buf_len) {
/* if total buffer is smaller then input, store locally */
if (inlen < left) {
memcpy(ctx->buf + ctx->buf_len, in, inlen);
ctx->buf_len += inlen;
return 1;
}
/* fill in local buffer and encrypt */
memcpy(ctx->buf + ctx->buf_len, in, left);
ret = (*ctx->cipher->do_cipher)(ctx, out, ctx->buf, blocksize);
memset(ctx->buf, 0, blocksize);
if (ret != 1)
return ret;
*outlen += blocksize;
inlen -= left;
in = ((unsigned char *)in) + left;
out = ((unsigned char *)out) + blocksize;
ctx->buf_len = 0;
}
if (inlen) {
ctx->buf_len = (inlen & ctx->block_mask);
inlen &= ~ctx->block_mask;
ret = (*ctx->cipher->do_cipher)(ctx, out, in, inlen);
if (ret != 1)
return ret;
*outlen += inlen;
in = ((unsigned char *)in) + inlen;
memcpy(ctx->buf, in, ctx->buf_len);
}
return 1;
} }
/** /**
@@ -872,9 +916,27 @@ EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, void *out, int *outlen,
int int
EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, void *out, int *outlen) EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, void *out, int *outlen)
{ {
if (ctx->buf_len == 0) *outlen = 0;
return 1;
return 0; if (ctx->buf_len) {
int ret, left, blocksize;
blocksize = EVP_CIPHER_CTX_block_size(ctx);
left = blocksize - ctx->buf_len;
assert(left > 0);
/* zero fill local buffer */
memset(ctx->buf + ctx->buf_len, 0, left);
ret = (*ctx->cipher->do_cipher)(ctx, out, ctx->buf, blocksize);
memset(ctx->buf, 0, blocksize);
if (ret != 1)
return ret;
*outlen += blocksize;
}
return 1;
} }
/** /**