X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=engines%2Fe_dasync.c;h=f6771abad104e71093a4e4030b6f18fcc4c36d84;hp=ed3f00adb6d6916e8a69a699efb46af53a82c0a2;hb=HEAD;hpb=440e5d805f449d662520313b33fd90aeee86980b diff --git a/engines/e_dasync.c b/engines/e_dasync.c index ed3f00adb6..5f809e8321 100644 --- a/engines/e_dasync.c +++ b/engines/e_dasync.c @@ -1,12 +1,28 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2024 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * 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 */ +/* We need to use some engine deprecated APIs */ +#define OPENSSL_SUPPRESS_DEPRECATED + +/* + * SHA-1 low level APIs are deprecated for public use, but still ok for + * internal use. Note, that due to symbols not being exported, only the + * #defines and structures can be accessed, in this case SHA_CBLOCK and + * sizeof(SHA_CTX). + */ +#include "internal/deprecated.h" + +#include +#if defined(_WIN32) +# include +#endif + #include #include @@ -21,17 +37,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 */ @@ -82,7 +96,7 @@ static int dasync_digest_nids(const int **nids) if (!init) { const EVP_MD *md; if ((md = dasync_sha1()) != NULL) - digest_nids[pos++] = EVP_MD_type(md); + digest_nids[pos++] = EVP_MD_get_type(md); digest_nids[pos] = 0; init = 1; } @@ -91,22 +105,29 @@ static int dasync_digest_nids(const int **nids) } /* RSA */ - -static int dasync_pub_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -static int dasync_pub_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -static int dasync_rsa_priv_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -static int dasync_rsa_priv_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -static int dasync_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, - BN_CTX *ctx); - -static int dasync_rsa_init(RSA *rsa); -static int dasync_rsa_finish(RSA *rsa); - -static RSA_METHOD *dasync_rsa_method = NULL; +static int dasync_pkey(ENGINE *e, EVP_PKEY_METHOD **pmeth, + const int **pnids, int nid); + +static int dasync_rsa_init(EVP_PKEY_CTX *ctx); +static void dasync_rsa_cleanup(EVP_PKEY_CTX *ctx); +static int dasync_rsa_paramgen_init(EVP_PKEY_CTX *ctx); +static int dasync_rsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey); +static int dasync_rsa_keygen_init(EVP_PKEY_CTX *ctx); +static int dasync_rsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey); +static int dasync_rsa_encrypt_init(EVP_PKEY_CTX *ctx); +static int dasync_rsa_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, + size_t *outlen, const unsigned char *in, + size_t inlen); +static int dasync_rsa_decrypt_init(EVP_PKEY_CTX *ctx); +static int dasync_rsa_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, + size_t *outlen, const unsigned char *in, + size_t inlen); +static int dasync_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2); +static int dasync_rsa_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, + const char *value); + +static EVP_PKEY_METHOD *dasync_rsa; +static const EVP_PKEY_METHOD *dasync_rsa_orig; /* AES */ @@ -118,6 +139,14 @@ static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl); static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx); +static int dasync_aes256_ctr_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, + void *ptr); +static int dasync_aes256_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc); +static int dasync_aes256_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl); +static int dasync_aes256_ctr_cleanup(EVP_CIPHER_CTX *ctx); + static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx, @@ -136,7 +165,6 @@ struct dasync_pipeline_ctx { unsigned char **inbufs; unsigned char **outbufs; size_t *lens; - int enc; unsigned char tlsaad[SSL_MAX_PIPELINES][EVP_AEAD_TLS1_AAD_LEN]; unsigned int aadctr; }; @@ -151,9 +179,23 @@ static const EVP_CIPHER *dasync_aes_128_cbc(void) return _hidden_aes_128_cbc; } +static EVP_CIPHER *_hidden_aes_256_ctr = NULL; +static const EVP_CIPHER *dasync_aes_256_ctr(void) +{ + return _hidden_aes_256_ctr; +} + /* * Holds the EVP_CIPHER object for aes_128_cbc_hmac_sha1 in this engine. Set up * once only during engine bind and can then be reused many times. + * + * This 'stitched' cipher depends on the EVP_aes_128_cbc_hmac_sha1() cipher, + * which is implemented only if the AES-NI instruction set extension is available + * (see OPENSSL_IA32CAP(3)). If that's not the case, then this cipher will not + * be available either. + * + * Note: Since it is a legacy mac-then-encrypt cipher, modern TLS peers (which + * negotiate the encrypt-then-mac extension) won't negotiate it anyway. */ static EVP_CIPHER *_hidden_aes_128_cbc_hmac_sha1 = NULL; static const EVP_CIPHER *dasync_aes_128_cbc_hmac_sha1(void) @@ -164,8 +206,10 @@ static const EVP_CIPHER *dasync_aes_128_cbc_hmac_sha1(void) static void destroy_ciphers(void) { EVP_CIPHER_meth_free(_hidden_aes_128_cbc); + EVP_CIPHER_meth_free(_hidden_aes_256_ctr); EVP_CIPHER_meth_free(_hidden_aes_128_cbc_hmac_sha1); _hidden_aes_128_cbc = NULL; + _hidden_aes_256_ctr = NULL; _hidden_aes_128_cbc_hmac_sha1 = NULL; } @@ -174,32 +218,37 @@ static int dasync_ciphers(ENGINE *e, const EVP_CIPHER **cipher, static int dasync_cipher_nids[] = { NID_aes_128_cbc, + NID_aes_256_ctr, NID_aes_128_cbc_hmac_sha1, 0 }; 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); + /* Setup RSA */ + if ((dasync_rsa_orig = EVP_PKEY_meth_find(EVP_PKEY_RSA)) == NULL + || (dasync_rsa = EVP_PKEY_meth_new(EVP_PKEY_RSA, + EVP_PKEY_FLAG_AUTOARGLEN)) == NULL) return 0; - } + EVP_PKEY_meth_set_init(dasync_rsa, dasync_rsa_init); + EVP_PKEY_meth_set_cleanup(dasync_rsa, dasync_rsa_cleanup); + EVP_PKEY_meth_set_paramgen(dasync_rsa, dasync_rsa_paramgen_init, + dasync_rsa_paramgen); + EVP_PKEY_meth_set_keygen(dasync_rsa, dasync_rsa_keygen_init, + dasync_rsa_keygen); + EVP_PKEY_meth_set_encrypt(dasync_rsa, dasync_rsa_encrypt_init, + dasync_rsa_encrypt); + EVP_PKEY_meth_set_decrypt(dasync_rsa, dasync_rsa_decrypt_init, + dasync_rsa_decrypt); + EVP_PKEY_meth_set_ctrl(dasync_rsa, dasync_rsa_ctrl, + dasync_rsa_ctrl_str); /* 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_pkey_meths(e, dasync_pkey) || !ENGINE_set_digests(e, dasync_digests) || !ENGINE_set_ciphers(e, dasync_ciphers) || !ENGINE_set_destroy_function(e, dasync_destroy) @@ -235,7 +284,8 @@ static int bind_dasync(ENGINE *e) || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_cbc, EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE - | EVP_CIPH_FLAG_PIPELINE) + | EVP_CIPH_FLAG_PIPELINE + | EVP_CIPH_CUSTOM_COPY) || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc, dasync_aes128_init_key) || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc, @@ -250,6 +300,30 @@ static int bind_dasync(ENGINE *e) _hidden_aes_128_cbc = NULL; } + _hidden_aes_256_ctr = EVP_CIPHER_meth_new(NID_aes_256_ctr, + 1 /* block size */, + 32 /* key len */); + if (_hidden_aes_256_ctr == NULL + || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_256_ctr,16) + || !EVP_CIPHER_meth_set_flags(_hidden_aes_256_ctr, + EVP_CIPH_FLAG_DEFAULT_ASN1 + | EVP_CIPH_CTR_MODE + | EVP_CIPH_FLAG_PIPELINE + | EVP_CIPH_CUSTOM_COPY) + || !EVP_CIPHER_meth_set_init(_hidden_aes_256_ctr, + dasync_aes256_init_key) + || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_256_ctr, + dasync_aes256_ctr_cipher) + || !EVP_CIPHER_meth_set_cleanup(_hidden_aes_256_ctr, + dasync_aes256_ctr_cleanup) + || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_256_ctr, + dasync_aes256_ctr_ctrl) + || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_256_ctr, + sizeof(struct dasync_pipeline_ctx))) { + EVP_CIPHER_meth_free(_hidden_aes_256_ctr); + _hidden_aes_256_ctr = NULL; + } + _hidden_aes_128_cbc_hmac_sha1 = EVP_CIPHER_meth_new( NID_aes_128_cbc_hmac_sha1, 16 /* block size */, @@ -260,7 +334,8 @@ static int bind_dasync(ENGINE *e) EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER - | EVP_CIPH_FLAG_PIPELINE) + | EVP_CIPH_FLAG_PIPELINE + | EVP_CIPH_CUSTOM_COPY) || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc_hmac_sha1, dasync_aes128_cbc_hmac_sha1_init_key) || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc_hmac_sha1, @@ -278,6 +353,16 @@ static int bind_dasync(ENGINE *e) return 1; } +static void destroy_pkey(void) +{ + /* + * We don't actually need to free the dasync_rsa method since this is + * automatically freed for us by libcrypto. + */ + dasync_rsa_orig = NULL; + dasync_rsa = NULL; +} + # ifndef OPENSSL_NO_DYNAMIC_ENGINE static int bind_helper(ENGINE *e, const char *id) { @@ -309,9 +394,19 @@ void engine_load_dasync_int(void) ENGINE *toadd = engine_dasync(); if (!toadd) return; + ERR_set_mark(); ENGINE_add(toadd); + /* + * If the "add" worked, it gets a structural reference. So either way, we + * release our just-created reference. + */ ENGINE_free(toadd); - ERR_clear_error(); + /* + * If the "add" didn't work, it was probably a conflict because it was + * already added (eg. someone calling ENGINE_load_blah then calling + * ENGINE_load_builtin_engines() perhaps). + */ + ERR_pop_to_mark(); } static int dasync_init(ENGINE *e) @@ -330,11 +425,30 @@ static int dasync_destroy(ENGINE *e) { destroy_digests(); destroy_ciphers(); - RSA_meth_free(dasync_rsa_method); + destroy_pkey(); ERR_unload_DASYNC_strings(); return 1; } +static int dasync_pkey(ENGINE *e, EVP_PKEY_METHOD **pmeth, + const int **pnids, int nid) +{ + static const int rnid = EVP_PKEY_RSA; + + if (pmeth == NULL) { + *pnids = &rnid; + return 1; + } + + if (nid == EVP_PKEY_RSA) { + *pmeth = dasync_rsa; + return 1; + } + + *pmeth = NULL; + return 0; +} + static int dasync_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid) { @@ -371,6 +485,9 @@ static int dasync_ciphers(ENGINE *e, const EVP_CIPHER **cipher, case NID_aes_128_cbc: *cipher = dasync_aes_128_cbc(); break; + case NID_aes_256_ctr: + *cipher = dasync_aes_256_ctr(); + break; case NID_aes_128_cbc_hmac_sha1: *cipher = dasync_aes_128_cbc_hmac_sha1(); break; @@ -401,6 +518,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) @@ -415,6 +534,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; @@ -435,8 +566,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; } @@ -469,13 +600,11 @@ static void dummy_pause_job(void) { * SHA1 implementation. At the moment we just defer to the standard * implementation */ -#undef data -#define data(ctx) ((SHA_CTX *)EVP_MD_CTX_md_data(ctx)) static int dasync_sha1_init(EVP_MD_CTX *ctx) { dummy_pause_job(); - return SHA1_Init(data(ctx)); + return EVP_MD_meth_get_init(EVP_sha1())(ctx); } static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data, @@ -483,74 +612,21 @@ static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data, { dummy_pause_job(); - return SHA1_Update(data(ctx), data, (size_t)count); + return EVP_MD_meth_get_update(EVP_sha1())(ctx, data, count); } static int dasync_sha1_final(EVP_MD_CTX *ctx, unsigned char *md) { dummy_pause_job(); - return SHA1_Final(md, data(ctx)); -} - -/* - * RSA implementation - */ - -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_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_meth_get_pub_dec(RSA_PKCS1_OpenSSL()) - (flen, from, to, rsa, padding); -} - -static int dasync_rsa_priv_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_meth_get_priv_enc(RSA_PKCS1_OpenSSL()) - (flen, from, to, rsa, padding); -} - -static int dasync_rsa_priv_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_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_meth_get_mod_exp(RSA_PKCS1_OpenSSL())(r0, I, rsa, ctx); -} - -static int dasync_rsa_init(RSA *rsa) -{ - return RSA_meth_get_init(RSA_PKCS1_OpenSSL())(rsa); -} -static int dasync_rsa_finish(RSA *rsa) -{ - return RSA_meth_get_finish(RSA_PKCS1_OpenSSL())(rsa); + return EVP_MD_meth_get_final(EVP_sha1())(ctx, md); } /* Cipher helper functions */ static int dasync_cipher_ctrl_helper(EVP_CIPHER_CTX *ctx, int type, int arg, - void *ptr, int aeadcapable) + void *ptr, int aeadcapable, + const EVP_CIPHER *ciph) { int ret; struct dasync_pipeline_ctx *pipe_ctx = @@ -560,6 +636,18 @@ static int dasync_cipher_ctrl_helper(EVP_CIPHER_CTX *ctx, int type, int arg, return 0; switch (type) { + case EVP_CTRL_COPY: + { + size_t sz = EVP_CIPHER_impl_ctx_size(ciph); + void *inner_cipher_data = OPENSSL_malloc(sz); + + if (inner_cipher_data == NULL) + return -1; + memcpy(inner_cipher_data, pipe_ctx->inner_cipher_data, sz); + pipe_ctx->inner_cipher_data = inner_cipher_data; + } + break; + case EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS: pipe_ctx->numpipes = arg; pipe_ctx->outbufs = (unsigned char **)ptr; @@ -601,8 +689,10 @@ static int dasync_cipher_ctrl_helper(EVP_CIPHER_CTX *ctx, int type, int arg, len = p[arg - 2] << 8 | p[arg - 1]; - if (pipe_ctx->enc) { + if (EVP_CIPHER_CTX_is_encrypting(ctx)) { if ((p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) { + if (len < AES_BLOCK_SIZE) + return 0; len -= AES_BLOCK_SIZE; } @@ -633,11 +723,8 @@ static int dasync_cipher_init_key_helper(EVP_CIPHER_CTX *ctx, && 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_CIPHER_INIT_KEY_HELPER, - ERR_R_MALLOC_FAILURE); + if (pipe_ctx->inner_cipher_data == NULL) return 0; - } } pipe_ctx->numpipes = 0; @@ -712,7 +799,7 @@ static int dasync_cipher_cleanup_helper(EVP_CIPHER_CTX *ctx, 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); + return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 0, EVP_aes_128_cbc()); } static int dasync_aes128_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, @@ -732,6 +819,29 @@ static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx) return dasync_cipher_cleanup_helper(ctx, EVP_aes_128_cbc()); } +static int dasync_aes256_ctr_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, + void *ptr) +{ + return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 0, EVP_aes_256_ctr()); +} + +static int dasync_aes256_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_256_ctr()); +} + +static int dasync_aes256_ctr_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_256_ctr()); +} + +static int dasync_aes256_ctr_cleanup(EVP_CIPHER_CTX *ctx) +{ + return dasync_cipher_cleanup_helper(ctx, EVP_aes_256_ctr()); +} + /* * AES128 CBC HMAC SHA1 Implementation @@ -740,7 +850,7 @@ static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx) 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); + return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 1, EVP_aes_128_cbc_hmac_sha1()); } static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx, @@ -748,6 +858,10 @@ static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *iv, int enc) { + /* + * We can safely assume that EVP_aes_128_cbc_hmac_sha1() != NULL, + * see comment before the definition of dasync_aes_128_cbc_hmac_sha1(). + */ return dasync_cipher_init_key_helper(ctx, key, iv, enc, EVP_aes_128_cbc_hmac_sha1()); } @@ -762,5 +876,131 @@ static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx) { + /* + * We can safely assume that EVP_aes_128_cbc_hmac_sha1() != NULL, + * see comment before the definition of dasync_aes_128_cbc_hmac_sha1(). + */ return dasync_cipher_cleanup_helper(ctx, EVP_aes_128_cbc_hmac_sha1()); } + + +/* + * RSA implementation + */ +static int dasync_rsa_init(EVP_PKEY_CTX *ctx) +{ + static int (*pinit)(EVP_PKEY_CTX *ctx); + + if (pinit == NULL) + EVP_PKEY_meth_get_init(dasync_rsa_orig, &pinit); + return pinit(ctx); +} + +static void dasync_rsa_cleanup(EVP_PKEY_CTX *ctx) +{ + static void (*pcleanup)(EVP_PKEY_CTX *ctx); + + if (pcleanup == NULL) + EVP_PKEY_meth_get_cleanup(dasync_rsa_orig, &pcleanup); + pcleanup(ctx); +} + +static int dasync_rsa_paramgen_init(EVP_PKEY_CTX *ctx) +{ + static int (*pparamgen_init)(EVP_PKEY_CTX *ctx); + + if (pparamgen_init == NULL) + EVP_PKEY_meth_get_paramgen(dasync_rsa_orig, &pparamgen_init, NULL); + return pparamgen_init != NULL ? pparamgen_init(ctx) : 1; +} + +static int dasync_rsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) +{ + static int (*pparamgen)(EVP_PKEY_CTX *c, EVP_PKEY *pkey); + + if (pparamgen == NULL) + EVP_PKEY_meth_get_paramgen(dasync_rsa_orig, NULL, &pparamgen); + return pparamgen != NULL ? pparamgen(ctx, pkey) : 1; +} + +static int dasync_rsa_keygen_init(EVP_PKEY_CTX *ctx) +{ + static int (*pkeygen_init)(EVP_PKEY_CTX *ctx); + + if (pkeygen_init == NULL) + EVP_PKEY_meth_get_keygen(dasync_rsa_orig, &pkeygen_init, NULL); + return pkeygen_init != NULL ? pkeygen_init(ctx) : 1; +} + +static int dasync_rsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) +{ + static int (*pkeygen)(EVP_PKEY_CTX *c, EVP_PKEY *pkey); + + if (pkeygen == NULL) + EVP_PKEY_meth_get_keygen(dasync_rsa_orig, NULL, &pkeygen); + return pkeygen(ctx, pkey); +} + +static int dasync_rsa_encrypt_init(EVP_PKEY_CTX *ctx) +{ + static int (*pencrypt_init)(EVP_PKEY_CTX *ctx); + + if (pencrypt_init == NULL) + EVP_PKEY_meth_get_encrypt(dasync_rsa_orig, &pencrypt_init, NULL); + return pencrypt_init != NULL ? pencrypt_init(ctx) : 1; +} + +static int dasync_rsa_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, + size_t *outlen, const unsigned char *in, + size_t inlen) +{ + static int (*pencryptfn)(EVP_PKEY_CTX *ctx, unsigned char *out, + size_t *outlen, const unsigned char *in, + size_t inlen); + + if (pencryptfn == NULL) + EVP_PKEY_meth_get_encrypt(dasync_rsa_orig, NULL, &pencryptfn); + return pencryptfn(ctx, out, outlen, in, inlen); +} + +static int dasync_rsa_decrypt_init(EVP_PKEY_CTX *ctx) +{ + static int (*pdecrypt_init)(EVP_PKEY_CTX *ctx); + + if (pdecrypt_init == NULL) + EVP_PKEY_meth_get_decrypt(dasync_rsa_orig, &pdecrypt_init, NULL); + return pdecrypt_init != NULL ? pdecrypt_init(ctx) : 1; +} + +static int dasync_rsa_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, + size_t *outlen, const unsigned char *in, + size_t inlen) +{ + static int (*pdecrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, + size_t *outlen, const unsigned char *in, + size_t inlen); + + if (pdecrypt == NULL) + EVP_PKEY_meth_get_decrypt(dasync_rsa_orig, NULL, &pdecrypt); + return pdecrypt(ctx, out, outlen, in, inlen); +} + +static int dasync_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) +{ + static int (*pctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2); + + if (pctrl == NULL) + EVP_PKEY_meth_get_ctrl(dasync_rsa_orig, &pctrl, NULL); + return pctrl(ctx, type, p1, p2); +} + +static int dasync_rsa_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, + const char *value) +{ + static int (*pctrl_str)(EVP_PKEY_CTX *ctx, const char *type, + const char *value); + + if (pctrl_str == NULL) + EVP_PKEY_meth_get_ctrl(dasync_rsa_orig, NULL, &pctrl_str); + return pctrl_str(ctx, type, value); +}