X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=engines%2Fe_dasync.c;h=3d80610b67ec5e2bc8276da40dc911fb164f9622;hp=28cef12c4463ac60a32a80c6d67fd09c16dbd8f3;hb=1842f369e5541d8ed9b2716cdd7d516005994733;hpb=11780ac3e22e9214dd1e0b71279b5e787f203163 diff --git a/engines/e_dasync.c b/engines/e_dasync.c index 28cef12c44..3d80610b67 100644 --- a/engines/e_dasync.c +++ b/engines/e_dasync.c @@ -1,55 +1,16 @@ /* - * Written by Matt Caswell (matt@openssl.org) for the OpenSSL project. - */ -/* ==================================================================== - * Copyright (c) 2015 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * licensing@OpenSSL.org. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html */ +#if defined(_WIN32) +# include +#endif + #include #include @@ -64,17 +25,15 @@ #include #include -#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS) +#if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS) # undef ASYNC_POSIX # define ASYNC_POSIX # include #elif defined(_WIN32) # undef ASYNC_WIN # define ASYNC_WIN -# include #endif -#define DASYNC_LIB_NAME "DASYNC" #include "e_dasync_err.c" /* Engine Id and Name */ @@ -86,7 +45,7 @@ static const char *engine_dasync_name = "Dummy Async engine support"; static int dasync_destroy(ENGINE *e); static int dasync_init(ENGINE *e); static int dasync_finish(ENGINE *e); -void engine_load_dasync_internal(void); +void engine_load_dasync_int(void); /* Set up digests. Just SHA1 for now */ @@ -149,23 +108,7 @@ static int dasync_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, static int dasync_rsa_init(RSA *rsa); static int dasync_rsa_finish(RSA *rsa); -static RSA_METHOD dasync_rsa_method = { - "Dummy Async RSA method", - dasync_pub_enc, /* pub_enc */ - dasync_pub_dec, /* pub_dec */ - dasync_rsa_priv_enc, /* priv_enc */ - dasync_rsa_priv_dec, /* priv_dec */ - dasync_rsa_mod_exp, /* rsa_mod_exp */ - BN_mod_exp_mont, /* bn_mod_exp */ - dasync_rsa_init, /* init */ - dasync_rsa_finish, /* finish */ - 0, /* flags */ - NULL, /* app_data */ - 0, /* rsa_sign */ - 0, /* rsa_verify */ - NULL /* rsa_keygen */ -}; - +static RSA_METHOD *dasync_rsa_method = NULL; /* AES */ @@ -189,7 +132,7 @@ static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, size_t inl); static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx); -struct aes_128_cbc_pipeline_ctx { +struct dasync_pipeline_ctx { void *inner_cipher_data; unsigned int numpipes; unsigned char **inbufs; @@ -239,12 +182,26 @@ static int dasync_cipher_nids[] = { static int bind_dasync(ENGINE *e) { + /* Setup RSA_METHOD */ + if ((dasync_rsa_method = RSA_meth_new("Dummy Async RSA method", 0)) == NULL + || RSA_meth_set_pub_enc(dasync_rsa_method, dasync_pub_enc) == 0 + || RSA_meth_set_pub_dec(dasync_rsa_method, dasync_pub_dec) == 0 + || RSA_meth_set_priv_enc(dasync_rsa_method, dasync_rsa_priv_enc) == 0 + || RSA_meth_set_priv_dec(dasync_rsa_method, dasync_rsa_priv_dec) == 0 + || RSA_meth_set_mod_exp(dasync_rsa_method, dasync_rsa_mod_exp) == 0 + || RSA_meth_set_bn_mod_exp(dasync_rsa_method, BN_mod_exp_mont) == 0 + || RSA_meth_set_init(dasync_rsa_method, dasync_rsa_init) == 0 + || RSA_meth_set_finish(dasync_rsa_method, dasync_rsa_finish) == 0) { + DASYNCerr(DASYNC_F_BIND_DASYNC, DASYNC_R_INIT_FAILED); + return 0; + } + /* Ensure the dasync error handling is set up */ ERR_load_DASYNC_strings(); if (!ENGINE_set_id(e, engine_dasync_id) || !ENGINE_set_name(e, engine_dasync_name) - || !ENGINE_set_RSA(e, &dasync_rsa_method) + || !ENGINE_set_RSA(e, dasync_rsa_method) || !ENGINE_set_digests(e, dasync_digests) || !ENGINE_set_ciphers(e, dasync_ciphers) || !ENGINE_set_destroy_function(e, dasync_destroy) @@ -290,7 +247,7 @@ static int bind_dasync(ENGINE *e) || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_cbc, dasync_aes128_cbc_ctrl) || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc, - sizeof(struct aes_128_cbc_pipeline_ctx))) { + sizeof(struct dasync_pipeline_ctx))) { EVP_CIPHER_meth_free(_hidden_aes_128_cbc); _hidden_aes_128_cbc = NULL; } @@ -315,7 +272,7 @@ static int bind_dasync(ENGINE *e) || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_cbc_hmac_sha1, dasync_aes128_cbc_hmac_sha1_ctrl) || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc_hmac_sha1, - sizeof(struct aes_128_cbc_pipeline_ctx))) { + sizeof(struct dasync_pipeline_ctx))) { EVP_CIPHER_meth_free(_hidden_aes_128_cbc_hmac_sha1); _hidden_aes_128_cbc_hmac_sha1 = NULL; } @@ -349,7 +306,7 @@ static ENGINE *engine_dasync(void) return ret; } -void engine_load_dasync_internal(void) +void engine_load_dasync_int(void) { ENGINE *toadd = engine_dasync(); if (!toadd) @@ -375,6 +332,7 @@ static int dasync_destroy(ENGINE *e) { destroy_digests(); destroy_ciphers(); + RSA_meth_free(dasync_rsa_method); ERR_unload_DASYNC_strings(); return 1; } @@ -445,6 +403,8 @@ static void wait_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, static void dummy_pause_job(void) { ASYNC_JOB *job; ASYNC_WAIT_CTX *waitctx; + ASYNC_callback_fn callback; + void * callback_arg; OSSL_ASYNC_FD pipefds[2] = {0, 0}; OSSL_ASYNC_FD *writefd; #if defined(ASYNC_WIN) @@ -459,6 +419,18 @@ static void dummy_pause_job(void) { waitctx = ASYNC_get_wait_ctx(job); + if (ASYNC_WAIT_CTX_get_callback(waitctx, &callback, &callback_arg) && callback != NULL) { + /* + * In the Dummy async engine we are cheating. We call the callback that the job + * is complete before the call to ASYNC_pause_job(). A real + * async engine would only call the callback when the job was actually complete + */ + (*callback)(callback_arg); + ASYNC_pause_job(); + return; + } + + if (ASYNC_WAIT_CTX_get_fd(waitctx, engine_dasync_id, &pipefds[0], (void **)&writefd)) { pipefds[1] = *writefd; @@ -479,8 +451,8 @@ static void dummy_pause_job(void) { #endif *writefd = pipefds[1]; - if(!ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_dasync_id, pipefds[0], - writefd, wait_cleanup)) { + if (!ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_dasync_id, pipefds[0], + writefd, wait_cleanup)) { wait_cleanup(waitctx, engine_dasync_id, pipefds[0], writefd); return; } @@ -545,14 +517,16 @@ static int dasync_pub_enc(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { /* Ignore errors - we carry on anyway */ dummy_pause_job(); - return RSA_PKCS1_OpenSSL()->rsa_pub_enc(flen, from, to, rsa, padding); + return RSA_meth_get_pub_enc(RSA_PKCS1_OpenSSL()) + (flen, from, to, rsa, padding); } static int dasync_pub_dec(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { /* Ignore errors - we carry on anyway */ dummy_pause_job(); - return RSA_PKCS1_OpenSSL()->rsa_pub_dec(flen, from, to, rsa, padding); + return RSA_meth_get_pub_dec(RSA_PKCS1_OpenSSL()) + (flen, from, to, rsa, padding); } static int dasync_rsa_priv_enc(int flen, const unsigned char *from, @@ -560,7 +534,8 @@ static int dasync_rsa_priv_enc(int flen, const unsigned char *from, { /* Ignore errors - we carry on anyway */ dummy_pause_job(); - return RSA_PKCS1_OpenSSL()->rsa_priv_enc(flen, from, to, rsa, padding); + return RSA_meth_get_priv_enc(RSA_PKCS1_OpenSSL()) + (flen, from, to, rsa, padding); } static int dasync_rsa_priv_dec(int flen, const unsigned char *from, @@ -568,137 +543,34 @@ static int dasync_rsa_priv_dec(int flen, const unsigned char *from, { /* Ignore errors - we carry on anyway */ dummy_pause_job(); - return RSA_PKCS1_OpenSSL()->rsa_priv_dec(flen, from, to, rsa, padding); + return RSA_meth_get_priv_dec(RSA_PKCS1_OpenSSL()) + (flen, from, to, rsa, padding); } static int dasync_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) { /* Ignore errors - we carry on anyway */ dummy_pause_job(); - return RSA_PKCS1_OpenSSL()->rsa_mod_exp(r0, I, rsa, ctx); + return RSA_meth_get_mod_exp(RSA_PKCS1_OpenSSL())(r0, I, rsa, ctx); } static int dasync_rsa_init(RSA *rsa) { - return RSA_PKCS1_OpenSSL()->init(rsa); + return RSA_meth_get_init(RSA_PKCS1_OpenSSL())(rsa); } static int dasync_rsa_finish(RSA *rsa) { - return RSA_PKCS1_OpenSSL()->finish(rsa); + return RSA_meth_get_finish(RSA_PKCS1_OpenSSL())(rsa); } -/* - * AES128 Implementation - */ +/* Cipher helper functions */ -static int dasync_aes128_cbc_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, - void *ptr) -{ - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); - - if (pipe_ctx == NULL) - return 0; - - switch (type) { - case EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS: - pipe_ctx->numpipes = arg; - pipe_ctx->outbufs = (unsigned char **)ptr; - break; - - case EVP_CTRL_SET_PIPELINE_INPUT_BUFS: - pipe_ctx->numpipes = arg; - pipe_ctx->inbufs = (unsigned char **)ptr; - break; - - case EVP_CTRL_SET_PIPELINE_INPUT_LENS: - pipe_ctx->numpipes = arg; - pipe_ctx->lens = (size_t *)ptr; - break; - - default: - return 0; - } - - return 1; -} - -static int dasync_aes128_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) +static int dasync_cipher_ctrl_helper(EVP_CIPHER_CTX *ctx, int type, int arg, + void *ptr, int aeadcapable) { int ret; - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); - - if (pipe_ctx->inner_cipher_data == NULL - && EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc()) != 0) { - pipe_ctx->inner_cipher_data = OPENSSL_zalloc( - EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc())); - if (pipe_ctx->inner_cipher_data == NULL) { - DASYNCerr(DASYNC_F_DASYNC_AES128_INIT_KEY, - ERR_R_MALLOC_FAILURE); - return 0; - } - } - - pipe_ctx->numpipes = 0; - pipe_ctx->aadctr = 0; - - EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data); - ret = EVP_CIPHER_meth_get_init(EVP_aes_128_cbc())(ctx, key, iv, enc); - EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx); - - return ret; -} - -static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl) -{ - int ret = 1; - unsigned int i, pipes; - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); - - pipes = pipe_ctx->numpipes; - EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data); - if (pipes == 0) { - ret = EVP_CIPHER_meth_get_do_cipher(EVP_aes_128_cbc()) - (ctx, out, in, inl); - } else { - for (i = 0; i < pipes; i++) { - ret = ret && EVP_CIPHER_meth_get_do_cipher(EVP_aes_128_cbc()) - (ctx, pipe_ctx->outbufs[i], - pipe_ctx->inbufs[i], - pipe_ctx->lens[i]); - } - pipe_ctx->numpipes = 0; - } - EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx); - return ret; -} - -static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx) -{ - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); - - OPENSSL_clear_free(pipe_ctx->inner_cipher_data, - EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc())); - - return 1; -} - - -/* - * AES128 CBC HMAC SHA1 Implementation - */ - -static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, - int arg, void *ptr) -{ - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); - int ret; + struct dasync_pipeline_ctx *pipe_ctx = + (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); if (pipe_ctx == NULL) return 0; @@ -720,6 +592,8 @@ static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, break; case EVP_CTRL_AEAD_SET_MAC_KEY: + if (!aeadcapable) + return -1; EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data); ret = EVP_CIPHER_meth_get_ctrl(EVP_aes_128_cbc_hmac_sha1()) (ctx, type, arg, ptr); @@ -731,7 +605,7 @@ static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, unsigned char *p = ptr; unsigned int len; - if (arg != EVP_AEAD_TLS1_AAD_LEN) + if (!aeadcapable || arg != EVP_AEAD_TLS1_AAD_LEN) return -1; if (pipe_ctx->aadctr >= SSL_MAX_PIPELINES) @@ -745,6 +619,8 @@ static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, if (pipe_ctx->enc) { if ((p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) { + if (len < AES_BLOCK_SIZE) + return 0; len -= AES_BLOCK_SIZE; } @@ -755,7 +631,6 @@ static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, } } - default: return 0; } @@ -763,48 +638,44 @@ static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, return 1; } -static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx, - const unsigned char *key, - const unsigned char *iv, - int enc) +static int dasync_cipher_init_key_helper(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc, + const EVP_CIPHER *cipher) { int ret; - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + struct dasync_pipeline_ctx *pipe_ctx = + (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); if (pipe_ctx->inner_cipher_data == NULL - && EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc_hmac_sha1()) - != 0) { - pipe_ctx->inner_cipher_data = - OPENSSL_zalloc(EVP_CIPHER_impl_ctx_size( - EVP_aes_128_cbc_hmac_sha1())); + && EVP_CIPHER_impl_ctx_size(cipher) != 0) { + pipe_ctx->inner_cipher_data = OPENSSL_zalloc( + EVP_CIPHER_impl_ctx_size(cipher)); if (pipe_ctx->inner_cipher_data == NULL) { - DASYNCerr(DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY, + DASYNCerr(DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER, ERR_R_MALLOC_FAILURE); return 0; } } pipe_ctx->numpipes = 0; - pipe_ctx->enc = enc; + pipe_ctx->aadctr = 0; EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data); - ret = EVP_CIPHER_meth_get_init(EVP_aes_128_cbc_hmac_sha1()) - (ctx, key, iv, enc); + ret = EVP_CIPHER_meth_get_init(cipher)(ctx, key, iv, enc); EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx); return ret; } -static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, - unsigned char *out, - const unsigned char *in, - size_t inl) +static int dasync_cipher_helper(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl, + const EVP_CIPHER *cipher) { int ret = 1; unsigned int i, pipes; - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + struct dasync_pipeline_ctx *pipe_ctx = + (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); pipes = pipe_ctx->numpipes; EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data); @@ -812,25 +683,24 @@ static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, if (pipe_ctx->aadctr != 0) { if (pipe_ctx->aadctr != 1) return -1; - EVP_CIPHER_meth_get_ctrl(EVP_aes_128_cbc_hmac_sha1()) + EVP_CIPHER_meth_get_ctrl(cipher) (ctx, EVP_CTRL_AEAD_TLS1_AAD, EVP_AEAD_TLS1_AAD_LEN, pipe_ctx->tlsaad[0]); } - ret = EVP_CIPHER_meth_get_do_cipher(EVP_aes_128_cbc_hmac_sha1()) + ret = EVP_CIPHER_meth_get_do_cipher(cipher) (ctx, out, in, inl); } else { if (pipe_ctx->aadctr > 0 && pipe_ctx->aadctr != pipes) return -1; for (i = 0; i < pipes; i++) { if (pipe_ctx->aadctr > 0) { - EVP_CIPHER_meth_get_ctrl(EVP_aes_128_cbc_hmac_sha1()) + EVP_CIPHER_meth_get_ctrl(cipher) (ctx, EVP_CTRL_AEAD_TLS1_AAD, EVP_AEAD_TLS1_AAD_LEN, pipe_ctx->tlsaad[i]); } - ret = ret && EVP_CIPHER_meth_get_do_cipher( - EVP_aes_128_cbc_hmac_sha1()) + ret = ret && EVP_CIPHER_meth_get_do_cipher(cipher) (ctx, pipe_ctx->outbufs[i], pipe_ctx->inbufs[i], pipe_ctx->lens[i]); } @@ -841,13 +711,74 @@ static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, return ret; } -static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx) +static int dasync_cipher_cleanup_helper(EVP_CIPHER_CTX *ctx, + const EVP_CIPHER *cipher) { - struct aes_128_cbc_pipeline_ctx *pipe_ctx = - (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + struct dasync_pipeline_ctx *pipe_ctx = + (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); OPENSSL_clear_free(pipe_ctx->inner_cipher_data, - EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc_hmac_sha1())); + EVP_CIPHER_impl_ctx_size(cipher)); return 1; } + +/* + * AES128 CBC Implementation + */ + +static int dasync_aes128_cbc_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, + void *ptr) +{ + return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 0); +} + +static int dasync_aes128_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + return dasync_cipher_init_key_helper(ctx, key, iv, enc, EVP_aes_128_cbc()); +} + +static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + return dasync_cipher_helper(ctx, out, in, inl, EVP_aes_128_cbc()); +} + +static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx) +{ + return dasync_cipher_cleanup_helper(ctx, EVP_aes_128_cbc()); +} + + +/* + * AES128 CBC HMAC SHA1 Implementation + */ + +static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, + int arg, void *ptr) +{ + return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 1); +} + +static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, + int enc) +{ + return dasync_cipher_init_key_helper(ctx, key, iv, enc, + EVP_aes_128_cbc_hmac_sha1()); +} + +static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, + unsigned char *out, + const unsigned char *in, + size_t inl) +{ + return dasync_cipher_helper(ctx, out, in, inl, EVP_aes_128_cbc_hmac_sha1()); +} + +static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx) +{ + return dasync_cipher_cleanup_helper(ctx, EVP_aes_128_cbc_hmac_sha1()); +}