X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=providers%2Fcommon%2Fciphers%2Faes.c;h=1b1074af16a36d9ea3e664578a2d48dc75abf192;hp=8d91ff48044a8e2eee34937e4baacca469060e0b;hb=3bfe9005e5ae0b513bf5f449d6cf558f9b4d9e1f;hpb=a39eb84006ca68d38d1c7204a6135647d06b5d01 diff --git a/providers/common/ciphers/aes.c b/providers/common/ciphers/aes.c index 8d91ff4804..1b1074af16 100644 --- a/providers/common/ciphers/aes.c +++ b/providers/common/ciphers/aes.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "internal/cryptlib.h" #include "internal/provider_algs.h" #include "ciphers_locl.h" @@ -27,15 +28,8 @@ static OSSL_OP_cipher_final_fn aes_stream_final; static OSSL_OP_cipher_cipher_fn aes_cipher; static OSSL_OP_cipher_freectx_fn aes_freectx; static OSSL_OP_cipher_dupctx_fn aes_dupctx; -static OSSL_OP_cipher_key_length_fn key_length_256; -static OSSL_OP_cipher_key_length_fn key_length_192; -static OSSL_OP_cipher_key_length_fn key_length_128; -static OSSL_OP_cipher_iv_length_fn iv_length_16; -static OSSL_OP_cipher_iv_length_fn iv_length_0; -static OSSL_OP_cipher_block_size_fn block_size_16; -static OSSL_OP_cipher_block_size_fn block_size_1; -static OSSL_OP_cipher_ctx_get_params_fn aes_ctx_get_params; -static OSSL_OP_cipher_ctx_set_params_fn aes_ctx_set_params; +static OSSL_OP_cipher_get_ctx_params_fn aes_get_ctx_params; +static OSSL_OP_cipher_set_ctx_params_fn aes_set_ctx_params; static int PROV_AES_KEY_generic_init(PROV_AES_KEY *ctx, const unsigned char *iv, @@ -44,7 +38,7 @@ static int PROV_AES_KEY_generic_init(PROV_AES_KEY *ctx, { if (iv != NULL && ctx->mode != EVP_CIPH_ECB_MODE) { if (ivlen != AES_BLOCK_SIZE) { - PROVerr(PROV_F_PROV_AES_KEY_GENERIC_INIT, ERR_R_INTERNAL_ERROR); + ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR); return 0; } memcpy(ctx->iv, iv, AES_BLOCK_SIZE); @@ -60,12 +54,12 @@ static int aes_einit(void *vctx, const unsigned char *key, size_t keylen, PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx; if (!PROV_AES_KEY_generic_init(ctx, iv, ivlen, 1)) { - /* PROVerr already called */ + /* ERR_raise already called */ return 0; } if (key != NULL) { if (keylen != ctx->keylen) { - PROVerr(PROV_F_AES_EINIT, PROV_R_INVALID_KEYLEN); + ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH); return 0; } return ctx->ciph->init(ctx, key, ctx->keylen); @@ -80,12 +74,12 @@ static int aes_dinit(void *vctx, const unsigned char *key, size_t keylen, PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx; if (!PROV_AES_KEY_generic_init(ctx, iv, ivlen, 0)) { - /* PROVerr already called */ + /* ERR_raise already called */ return 0; } if (key != NULL) { if (keylen != ctx->keylen) { - PROVerr(PROV_F_AES_DINIT, PROV_R_INVALID_KEYLEN); + ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH); return 0; } return ctx->ciph->init(ctx, key, ctx->keylen); @@ -110,11 +104,11 @@ static int aes_block_update(void *vctx, unsigned char *out, size_t *outl, if (ctx->bufsz == AES_BLOCK_SIZE && (ctx->enc || inl > 0 || !ctx->pad)) { if (outsize < AES_BLOCK_SIZE) { - PROVerr(PROV_F_AES_BLOCK_UPDATE, PROV_R_OUTPUT_BUFFER_TOO_SMALL); + ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); return 0; } if (!ctx->ciph->cipher(ctx, out, ctx->buf, AES_BLOCK_SIZE)) { - PROVerr(PROV_F_AES_BLOCK_UPDATE, PROV_R_CIPHER_OPERATION_FAILED); + ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED); return 0; } ctx->bufsz = 0; @@ -124,25 +118,25 @@ static int aes_block_update(void *vctx, unsigned char *out, size_t *outl, if (nextblocks > 0) { if (!ctx->enc && ctx->pad && nextblocks == inl) { if (!ossl_assert(inl >= AES_BLOCK_SIZE)) { - PROVerr(PROV_F_AES_BLOCK_UPDATE, PROV_R_OUTPUT_BUFFER_TOO_SMALL); + ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); return 0; } nextblocks -= AES_BLOCK_SIZE; } outlint += nextblocks; if (outsize < outlint) { - PROVerr(PROV_F_AES_BLOCK_UPDATE, PROV_R_OUTPUT_BUFFER_TOO_SMALL); + ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); return 0; } if (!ctx->ciph->cipher(ctx, out, in, nextblocks)) { - PROVerr(PROV_F_AES_BLOCK_UPDATE, PROV_R_CIPHER_OPERATION_FAILED); + ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED); return 0; } in += nextblocks; inl -= nextblocks; } if (!trailingdata(ctx->buf, &ctx->bufsz, AES_BLOCK_SIZE, &in, &inl)) { - /* PROVerr already called */ + /* ERR_raise already called */ return 0; } @@ -162,16 +156,16 @@ static int aes_block_final(void *vctx, unsigned char *out, size_t *outl, *outl = 0; return 1; } else if (ctx->bufsz != AES_BLOCK_SIZE) { - PROVerr(PROV_F_AES_BLOCK_FINAL, PROV_R_WRONG_FINAL_BLOCK_LENGTH); + ERR_raise(ERR_LIB_PROV, PROV_R_WRONG_FINAL_BLOCK_LENGTH); return 0; } if (outsize < AES_BLOCK_SIZE) { - PROVerr(PROV_F_AES_BLOCK_FINAL, PROV_R_OUTPUT_BUFFER_TOO_SMALL); + ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); return 0; } if (!ctx->ciph->cipher(ctx, out, ctx->buf, AES_BLOCK_SIZE)) { - PROVerr(PROV_F_AES_BLOCK_FINAL, PROV_R_CIPHER_OPERATION_FAILED); + ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED); return 0; } ctx->bufsz = 0; @@ -185,22 +179,22 @@ static int aes_block_final(void *vctx, unsigned char *out, size_t *outl, *outl = 0; return 1; } - PROVerr(PROV_F_AES_BLOCK_FINAL, PROV_R_WRONG_FINAL_BLOCK_LENGTH); + ERR_raise(ERR_LIB_PROV, PROV_R_WRONG_FINAL_BLOCK_LENGTH); return 0; } if (!ctx->ciph->cipher(ctx, ctx->buf, ctx->buf, AES_BLOCK_SIZE)) { - PROVerr(PROV_F_AES_BLOCK_FINAL, PROV_R_CIPHER_OPERATION_FAILED); + ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED); return 0; } if (ctx->pad && !unpadblock(ctx->buf, &ctx->bufsz, AES_BLOCK_SIZE)) { - /* PROVerr already called */ + /* ERR_raise already called */ return 0; } if (outsize < ctx->bufsz) { - PROVerr(PROV_F_AES_BLOCK_FINAL, PROV_R_OUTPUT_BUFFER_TOO_SMALL); + ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); return 0; } memcpy(out, ctx->buf, ctx->bufsz); @@ -216,12 +210,12 @@ static int aes_stream_update(void *vctx, unsigned char *out, size_t *outl, PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx; if (outsize < inl) { - PROVerr(PROV_F_AES_STREAM_UPDATE, PROV_R_OUTPUT_BUFFER_TOO_SMALL); + ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); return 0; } if (!ctx->ciph->cipher(ctx, out, in, inl)) { - PROVerr(PROV_F_AES_STREAM_UPDATE, PROV_R_CIPHER_OPERATION_FAILED); + ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED); return 0; } @@ -242,12 +236,12 @@ static int aes_cipher(void *vctx, PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx; if (outsize < inl) { - PROVerr(PROV_F_AES_CIPHER, PROV_R_OUTPUT_BUFFER_TOO_SMALL); + ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); return 0; } if (!ctx->ciph->cipher(ctx, out, in, inl)) { - PROVerr(PROV_F_AES_CIPHER, PROV_R_CIPHER_OPERATION_FAILED); + ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED); return 0; } @@ -255,69 +249,17 @@ static int aes_cipher(void *vctx, return 1; } -#define IMPLEMENT_new_params(lcmode, UCMODE) \ - static OSSL_OP_cipher_get_params_fn aes_##lcmode##_get_params; \ - static int aes_##lcmode##_get_params(const OSSL_PARAM params[]) \ - { \ - const OSSL_PARAM *p; \ - \ - p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_MODE); \ - if (p != NULL && !OSSL_PARAM_set_int(p, EVP_CIPH_##UCMODE##_MODE)) \ - return 0; \ - \ - return 1; \ - } - -#define IMPLEMENT_new_ctx(lcmode, UCMODE, len) \ - static OSSL_OP_cipher_newctx_fn aes_##len##_##lcmode##_newctx; \ - static void *aes_##len##_##lcmode##_newctx(void *provctx) \ - { \ - PROV_AES_KEY *ctx = OPENSSL_zalloc(sizeof(*ctx)); \ - \ - ctx->pad = 1; \ - ctx->keylen = (len / 8); \ - ctx->ciph = PROV_AES_CIPHER_##lcmode(ctx->keylen); \ - ctx->mode = EVP_CIPH_##UCMODE##_MODE; \ - return ctx; \ - } - -/* ECB */ -IMPLEMENT_new_params(ecb, ECB) -IMPLEMENT_new_ctx(ecb, ECB, 256) -IMPLEMENT_new_ctx(ecb, ECB, 192) -IMPLEMENT_new_ctx(ecb, ECB, 128) - -/* CBC */ -IMPLEMENT_new_params(cbc, CBC) -IMPLEMENT_new_ctx(cbc, CBC, 256) -IMPLEMENT_new_ctx(cbc, CBC, 192) -IMPLEMENT_new_ctx(cbc, CBC, 128) - -/* OFB */ -IMPLEMENT_new_params(ofb, OFB) -IMPLEMENT_new_ctx(ofb, OFB, 256) -IMPLEMENT_new_ctx(ofb, OFB, 192) -IMPLEMENT_new_ctx(ofb, OFB, 128) - -/* CFB */ -IMPLEMENT_new_params(cfb, CFB) -IMPLEMENT_new_params(cfb1, CFB) -IMPLEMENT_new_params(cfb8, CFB) -IMPLEMENT_new_ctx(cfb, CFB, 256) -IMPLEMENT_new_ctx(cfb, CFB, 192) -IMPLEMENT_new_ctx(cfb, CFB, 128) -IMPLEMENT_new_ctx(cfb1, CFB, 256) -IMPLEMENT_new_ctx(cfb1, CFB, 192) -IMPLEMENT_new_ctx(cfb1, CFB, 128) -IMPLEMENT_new_ctx(cfb8, CFB, 256) -IMPLEMENT_new_ctx(cfb8, CFB, 192) -IMPLEMENT_new_ctx(cfb8, CFB, 128) +static void *aes_new_ctx(void *provctx, size_t mode, size_t kbits, + const PROV_AES_CIPHER *ciph) +{ + PROV_AES_KEY *ctx = OPENSSL_zalloc(sizeof(*ctx)); -/* CTR */ -IMPLEMENT_new_params(ctr, CTR) -IMPLEMENT_new_ctx(ctr, CTR, 256) -IMPLEMENT_new_ctx(ctr, CTR, 192) -IMPLEMENT_new_ctx(ctr, CTR, 128) + ctx->pad = 1; + ctx->keylen = kbits / 8; + ctx->ciph = ciph; + ctx->mode = mode; + return ctx; +} static void aes_freectx(void *vctx) { @@ -332,7 +274,7 @@ static void *aes_dupctx(void *ctx) PROV_AES_KEY *ret = OPENSSL_malloc(sizeof(*ret)); if (ret == NULL) { - PROVerr(PROV_F_AES_DUPCTX, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE); return NULL; } *ret = *in; @@ -340,138 +282,177 @@ static void *aes_dupctx(void *ctx) return ret; } -static size_t key_length_256(void) -{ - return 256 / 8; -} - -static size_t key_length_192(void) -{ - return 192 / 8; -} - -static size_t key_length_128(void) -{ - return 128 / 8; -} - -static size_t iv_length_16(void) -{ - return 16; -} - -static size_t iv_length_0(void) -{ - return 0; -} - -static size_t block_size_16(void) -{ - return 16; -} - -static size_t block_size_1(void) -{ - return 1; -} - -static int aes_ctx_get_params(void *vctx, const OSSL_PARAM params[]) +static int aes_get_ctx_params(void *vctx, OSSL_PARAM params[]) { PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx; - const OSSL_PARAM *p; + OSSL_PARAM *p; + p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_IVLEN); + if (p != NULL && !OSSL_PARAM_set_int(p, AES_BLOCK_SIZE)) { + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); + return 0; + } p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_PADDING); if (p != NULL && !OSSL_PARAM_set_int(p, ctx->pad)) { - PROVerr(PROV_F_AES_CTX_GET_PARAMS, PROV_R_FAILED_TO_SET_PARAMETER); + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); + return 0; + } + p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_IV); + if (p != NULL + && !OSSL_PARAM_set_octet_ptr(p, &ctx->iv, AES_BLOCK_SIZE) + && !OSSL_PARAM_set_octet_string(p, &ctx->iv, AES_BLOCK_SIZE)) { + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); + return 0; + } + p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_NUM); + if (p != NULL && !OSSL_PARAM_set_size_t(p, ctx->num)) { + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); + return 0; + } + p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_KEYLEN); + if (p != NULL && !OSSL_PARAM_set_int(p, ctx->keylen)) { + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); return 0; } return 1; } -static int aes_ctx_set_params(void *vctx, const OSSL_PARAM params[]) +static int aes_set_ctx_params(void *vctx, const OSSL_PARAM params[]) { PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx; const OSSL_PARAM *p; - p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_PADDING); + p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_PADDING); if (p != NULL) { int pad; if (!OSSL_PARAM_get_int(p, &pad)) { - PROVerr(PROV_F_AES_CTX_SET_PARAMS, PROV_R_FAILED_TO_GET_PARAMETER); + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER); return 0; } ctx->pad = pad ? 1 : 0; } + p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_NUM); + if (p != NULL) { + int num; + + if (!OSSL_PARAM_get_int(p, &num)) { + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER); + return 0; + } + ctx->num = num; + } + p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_KEYLEN); + if (p != NULL) { + int keylen; + + if (!OSSL_PARAM_get_int(p, &keylen)) { + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER); + return 0; + } + ctx->keylen = keylen; + } return 1; } -#define IMPLEMENT_block_funcs(mode, keylen, ivlen) \ - const OSSL_DISPATCH aes##keylen##mode##_functions[] = { \ - { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))aes_##keylen##_##mode##_newctx }, \ - { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_einit }, \ - { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_dinit }, \ - { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_block_update }, \ - { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_block_final }, \ - { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))aes_cipher }, \ - { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_freectx }, \ - { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_dupctx }, \ - { OSSL_FUNC_CIPHER_KEY_LENGTH, (void (*)(void))key_length_##keylen }, \ - { OSSL_FUNC_CIPHER_IV_LENGTH, (void (*)(void))iv_length_##ivlen }, \ - { OSSL_FUNC_CIPHER_BLOCK_SIZE, (void (*)(void))block_size_16 }, \ - { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))aes_##mode##_get_params }, \ - { OSSL_FUNC_CIPHER_CTX_GET_PARAMS, (void (*)(void))aes_ctx_get_params }, \ - { OSSL_FUNC_CIPHER_CTX_SET_PARAMS, (void (*)(void))aes_ctx_set_params }, \ - { 0, NULL } \ - }; - -#define IMPLEMENT_stream_funcs(mode, keylen, ivlen) \ - const OSSL_DISPATCH aes##keylen##mode##_functions[] = { \ - { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))aes_##keylen##_##mode##_newctx }, \ - { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_einit }, \ - { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_dinit }, \ - { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_stream_update }, \ - { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_stream_final }, \ - { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))aes_cipher }, \ - { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_freectx }, \ - { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_dupctx }, \ - { OSSL_FUNC_CIPHER_KEY_LENGTH, (void (*)(void))key_length_##keylen }, \ - { OSSL_FUNC_CIPHER_IV_LENGTH, (void (*)(void))iv_length_##ivlen }, \ - { OSSL_FUNC_CIPHER_BLOCK_SIZE, (void (*)(void))block_size_1 }, \ - { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))aes_##mode##_get_params }, \ - { OSSL_FUNC_CIPHER_CTX_GET_PARAMS, (void (*)(void))aes_ctx_get_params }, \ - { OSSL_FUNC_CIPHER_CTX_SET_PARAMS, (void (*)(void))aes_ctx_set_params }, \ - { 0, NULL } \ - }; +#define IMPLEMENT_cipher(lcmode, UCMODE, flags, kbits, blkbits, ivbits) \ + static OSSL_OP_cipher_get_params_fn aes_##kbits##_##lcmode##_get_params; \ + static int aes_##kbits##_##lcmode##_get_params(OSSL_PARAM params[]) \ + { \ + return cipher_default_get_params(params, EVP_CIPH_##UCMODE##_MODE, \ + flags, kbits, blkbits, ivbits); \ + } \ + static OSSL_OP_cipher_newctx_fn aes_##kbits##_##lcmode##_newctx; \ + static void *aes_##kbits##_##lcmode##_newctx(void *provctx) \ + { \ + return aes_new_ctx(provctx, EVP_CIPH_##UCMODE##_MODE, kbits, \ + PROV_AES_CIPHER_##lcmode(kbits / 8)); \ + } + +/* ECB */ +IMPLEMENT_cipher(ecb, ECB, 0, 256, 128, 0) +IMPLEMENT_cipher(ecb, ECB, 0, 192, 128, 0) +IMPLEMENT_cipher(ecb, ECB, 0, 128, 128, 0) + +/* CBC */ +IMPLEMENT_cipher(cbc, CBC, 0, 256, 128, 128) +IMPLEMENT_cipher(cbc, CBC, 0, 192, 128, 128) +IMPLEMENT_cipher(cbc, CBC, 0, 128, 128, 128) + +/* OFB */ +IMPLEMENT_cipher(ofb, OFB, 0, 256, 8, 128) +IMPLEMENT_cipher(ofb, OFB, 0, 192, 8, 128) +IMPLEMENT_cipher(ofb, OFB, 0, 128, 8, 128) + +/* CFB */ +IMPLEMENT_cipher(cfb, CFB, 0, 256, 8, 128) +IMPLEMENT_cipher(cfb, CFB, 0, 192, 8, 128) +IMPLEMENT_cipher(cfb, CFB, 0, 128, 8, 128) +IMPLEMENT_cipher(cfb1, CFB, 0, 256, 8, 128) +IMPLEMENT_cipher(cfb1, CFB, 0, 192, 8, 128) +IMPLEMENT_cipher(cfb1, CFB, 0, 128, 8, 128) +IMPLEMENT_cipher(cfb8, CFB, 0, 256, 8, 128) +IMPLEMENT_cipher(cfb8, CFB, 0, 192, 8, 128) +IMPLEMENT_cipher(cfb8, CFB, 0, 128, 8, 128) + +/* CTR */ +IMPLEMENT_cipher(ctr, CTR, 0, 256, 8, 128) +IMPLEMENT_cipher(ctr, CTR, 0, 192, 8, 128) +IMPLEMENT_cipher(ctr, CTR, 0, 128, 8, 128) + +#define IMPLEMENT_funcs(mode, kbits, type) \ +const OSSL_DISPATCH aes##kbits##mode##_functions[] = { \ + { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))aes_##kbits##_##mode##_newctx },\ + { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_einit }, \ + { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_dinit }, \ + { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_##type##_update }, \ + { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_##type##_final }, \ + { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))aes_cipher }, \ + { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_freectx }, \ + { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_dupctx }, \ + { OSSL_FUNC_CIPHER_GET_PARAMS, \ + (void (*)(void))aes_##kbits##_##mode##_get_params }, \ + { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, \ + (void (*)(void))aes_get_ctx_params }, \ + { OSSL_FUNC_CIPHER_SET_CTX_PARAMS, \ + (void (*)(void))aes_set_ctx_params }, \ + { OSSL_FUNC_CIPHER_GETTABLE_PARAMS, \ + (void (*)(void))cipher_default_gettable_params }, \ + { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS, \ + (void (*)(void))cipher_default_gettable_ctx_params }, \ + { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS, \ + (void (*)(void))cipher_default_settable_ctx_params }, \ + { 0, NULL } \ +}; /* ECB */ -IMPLEMENT_block_funcs(ecb, 256, 0) -IMPLEMENT_block_funcs(ecb, 192, 0) -IMPLEMENT_block_funcs(ecb, 128, 0) +IMPLEMENT_funcs(ecb, 256, block) +IMPLEMENT_funcs(ecb, 192, block) +IMPLEMENT_funcs(ecb, 128, block) /* CBC */ -IMPLEMENT_block_funcs(cbc, 256, 16) -IMPLEMENT_block_funcs(cbc, 192, 16) -IMPLEMENT_block_funcs(cbc, 128, 16) +IMPLEMENT_funcs(cbc, 256, block) +IMPLEMENT_funcs(cbc, 192, block) +IMPLEMENT_funcs(cbc, 128, block) /* OFB */ -IMPLEMENT_stream_funcs(ofb, 256, 16) -IMPLEMENT_stream_funcs(ofb, 192, 16) -IMPLEMENT_stream_funcs(ofb, 128, 16) +IMPLEMENT_funcs(ofb, 256, stream) +IMPLEMENT_funcs(ofb, 192, stream) +IMPLEMENT_funcs(ofb, 128, stream) /* CFB */ -IMPLEMENT_stream_funcs(cfb, 256, 16) -IMPLEMENT_stream_funcs(cfb, 192, 16) -IMPLEMENT_stream_funcs(cfb, 128, 16) -IMPLEMENT_stream_funcs(cfb1, 256, 16) -IMPLEMENT_stream_funcs(cfb1, 192, 16) -IMPLEMENT_stream_funcs(cfb1, 128, 16) -IMPLEMENT_stream_funcs(cfb8, 256, 16) -IMPLEMENT_stream_funcs(cfb8, 192, 16) -IMPLEMENT_stream_funcs(cfb8, 128, 16) +IMPLEMENT_funcs(cfb, 256, stream) +IMPLEMENT_funcs(cfb, 192, stream) +IMPLEMENT_funcs(cfb, 128, stream) +IMPLEMENT_funcs(cfb1, 256, stream) +IMPLEMENT_funcs(cfb1, 192, stream) +IMPLEMENT_funcs(cfb1, 128, stream) +IMPLEMENT_funcs(cfb8, 256, stream) +IMPLEMENT_funcs(cfb8, 192, stream) +IMPLEMENT_funcs(cfb8, 128, stream) /* CTR */ -IMPLEMENT_stream_funcs(ctr, 256, 16) -IMPLEMENT_stream_funcs(ctr, 192, 16) -IMPLEMENT_stream_funcs(ctr, 128, 16) +IMPLEMENT_funcs(ctr, 256, stream) +IMPLEMENT_funcs(ctr, 192, stream) +IMPLEMENT_funcs(ctr, 128, stream)