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

First implementation of EVP_CipherUpdate and EVP_CipherFinal_ex that

Browse Source 
only handle buffers on block bounderies.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23635 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-18 20:15:16 +00:00
parent 248222b8f6
commit bbc4454631
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/hcrypto/evp.c
View File

@@ -779,6 +779,9 @@ EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *c, ENGINE *engine,
if (ctx->cipher_data == NULL && c->ctx_size != 0) if (ctx->cipher_data == NULL && c->ctx_size != 0)
return 0; return 0;
/* assume block size is a multiple of 2 */
ctx->block_mask = EVP_CIPHER_block_size(c) - 1;
} else if (ctx->cipher == NULL) { } else if (ctx->cipher == NULL) {
/* reuse of cipher, but not any cipher ever set! */ /* reuse of cipher, but not any cipher ever set! */
return 0; return 0;
@@ -818,12 +821,31 @@ EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *c, ENGINE *engine,
* See @ref evp_cipher for an example how to use this function. * See @ref evp_cipher for an example how to use this function.
* *
* @return 1 on success. * @return 1 on success.
*
* @ingroup hcrypto_evp
*/ */
int 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;
/**
* If there in no spare bytes in the left from last Update and the
* input length is on the block boundery, the EVP_CipherUpdate()
* function can take a shortcut (and preformance gain) and
* directly encrypt the data, otherwise we hav to fix it up and
* store extra it the EVP_CIPHER_CTX.
*/
if (ctx->buf_len == 0 && (inlen & ctx->block_mask) == 0) {
ret = (*ctx->cipher->do_cipher)(ctx, out, in, inlen);
if (ret == 1)
*outlen = inlen;
else
*outlen = 0;
return ret;
}
return 0; return 0;
} }
@@ -840,12 +862,15 @@ EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, void *out, int *outlen,
* See @ref evp_cipher for an example how to use this function. * See @ref evp_cipher for an example how to use this function.
* *
* @return 1 on success. * @return 1 on success.
*
* @ingroup hcrypto_evp
*/ */
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)
return 1;
return 0; return 0;
} }