Skip to content

Introduce intermediate digest/MAC API and use it in the engine and provider #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chipitsine merged 2 commits into from
Mar 15, 2026
Merged

Introduce intermediate digest/MAC API and use it in the engine and provider #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2007a
Revert "Introduce standalone gost_digest adaptor for provider"
Mironenko Mar 12, 2026
a13b0e4
Introduce intermediate digest/MAC API and use it in the engine and pr…
Mironenko Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ set(GOST_ERR_SOURCE_FILES
e_gost_err.h
)

set(GOST_LEGACY_CORE_SOURCE_FILES
set(GOST_CORE_SOURCE_FILES
gost_ameth.c
gost_pmeth.c
gost_ctl.c
Expand All @@ -178,14 +178,9 @@ set(GOST_LEGACY_CORE_SOURCE_FILES
gost_lcl.h
gost_params.c
gost_keyexpimp.c
)

set(GOST_NEW_CORE_DIGEST_SOURCE_FILES
gost_digest_3411_2012.c
gost_digest_3411_94.c
gost_digest_base.c
gost_digest.c
)
gost_digest_ctx.c
)

set(GOST_EC_SOURCE_FILES
gost_ec_keyx.c
Expand All @@ -206,14 +201,16 @@ set (GOST_OMAC_SOURCE_FILES
)

set(GOST_LIB_SOURCE_FILES
${GOST_LEGACY_CORE_SOURCE_FILES}
${GOST_CORE_SOURCE_FILES}
${GOST_GRASSHOPPER_SOURCE_FILES}
${GOST_EC_SOURCE_FILES}
${GOST_OMAC_SOURCE_FILES}
)

set(GOST_ENGINE_SOURCE_FILES
gost_eng.c
gost_eng_digest.c
gost_eng_digest_define.c
)

set(GOST_PROV_SOURCE_FILES
Expand Down Expand Up @@ -418,10 +415,6 @@ add_library(gost_err STATIC ${GOST_ERR_SOURCE_FILES})
set_target_properties(gost_err PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_link_libraries(gost_err PRIVATE OpenSSL::Crypto)

add_library(gost_new_core_digest STATIC ${GOST_NEW_CORE_DIGEST_SOURCE_FILES})
set_target_properties(gost_new_core_digest PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_link_libraries(gost_new_core_digest PRIVATE OpenSSL::Crypto gosthash gosthash2012)

# The GOST engine in module form
add_library(gost_engine MODULE ${GOST_ENGINE_SOURCE_FILES})
# Set the suffix explicitly to adapt to OpenSSL's idea of what a
Expand Down Expand Up @@ -451,7 +444,7 @@ set_target_properties(gost_prov PROPERTIES
PREFIX "" OUTPUT_NAME "gostprov" SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}
COMPILE_DEFINITIONS "BUILDING_GOST_PROVIDER;OPENSSL_NO_DYNAMIC_ENGINE"
)
target_link_libraries(gost_prov PRIVATE gost_core gost_new_core_digest libprov)
target_link_libraries(gost_prov PRIVATE gost_core libprov)

if (NOT MSVC)
# The GOST provider in library form
Expand All @@ -462,7 +455,7 @@ set_target_properties(lib_gost_prov PROPERTIES
OUTPUT_NAME "gostprov"
COMPILE_DEFINITIONS "BUILDING_GOST_PROVIDER;BUILDING_PROVIDER_AS_LIBRARY;OPENSSL_NO_DYNAMIC_ENGINE"
)
target_link_libraries(lib_gost_prov PRIVATE gost_core gost_new_core_digest libprov)
target_link_libraries(lib_gost_prov PRIVATE gost_core libprov)
endif()

set(GOST_SUM_SOURCE_FILES
Expand Down
66 changes: 32 additions & 34 deletions gost_crypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "gost_lcl.h"
#include "gost_gost2015.h"
#include "gost_tls12_additional.h"
#include "gost_digest_details.h"

#if !defined(CCGOST_DEBUG) && !defined(DEBUG)
# ifndef NDEBUG
Expand Down Expand Up @@ -290,23 +291,20 @@ GOST_cipher magma_cbc_cipher = {

/* Implementation of GOST 28147-89 in MAC (imitovstavka) mode */
/* Init functions which set specific parameters */
static int gost_imit_init_cpa(EVP_MD_CTX *ctx);
static int gost_imit_init_cp_12(EVP_MD_CTX *ctx);
/* process block of data */
static int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count);
/* Return computed value */
static int gost_imit_final(EVP_MD_CTX *ctx, unsigned char *md);
/* Copies context */
static int gost_imit_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from);
static int gost_imit_cleanup(EVP_MD_CTX *ctx);
/* Control function, knows how to set MAC key.*/
static int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr);

GOST_digest Gost28147_89_MAC_digest = {
static int gost_imit_init_cpa(GOST_digest_ctx *ctx);
static int gost_imit_init_cp_12(GOST_digest_ctx *ctx);
static int gost_imit_update(GOST_digest_ctx *ctx, const void *data,
size_t count);
static int gost_imit_final(GOST_digest_ctx *ctx, unsigned char *md);
static int gost_imit_copy(GOST_digest_ctx *to, const GOST_digest_ctx *from);
static int gost_imit_cleanup(GOST_digest_ctx *ctx);
static int gost_imit_ctrl(GOST_digest_ctx *ctx, int cmd, int p1, void *p2);

GOST_digest Gost28147_89_mac = {
.nid = NID_id_Gost28147_89_MAC,
.result_size = 4,
.input_blocksize = 8,
.app_datasize = sizeof(struct ossl_gost_imit_ctx),
.algctx_size = sizeof(struct ossl_gost_imit_ctx),
.flags = EVP_MD_FLAG_XOF,
.init = gost_imit_init_cpa,
.update = gost_imit_update,
Expand All @@ -316,11 +314,11 @@ GOST_digest Gost28147_89_MAC_digest = {
.ctrl = gost_imit_ctrl,
};

GOST_digest Gost28147_89_mac_12_digest = {
GOST_digest Gost28147_89_mac_12 = {
.nid = NID_gost_mac_12,
.result_size = 4,
.input_blocksize = 8,
.app_datasize = sizeof(struct ossl_gost_imit_ctx),
.algctx_size = sizeof(struct ossl_gost_imit_ctx),
.flags = EVP_MD_FLAG_XOF,
.init = gost_imit_init_cp_12,
.update = gost_imit_update,
Expand Down Expand Up @@ -1512,9 +1510,9 @@ static int magma_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params)
return 1;
}

static int gost_imit_init(EVP_MD_CTX *ctx, gost_subst_block * block)
static int gost_imit_init(GOST_digest_ctx *ctx, gost_subst_block * block)
{
struct ossl_gost_imit_ctx *c = EVP_MD_CTX_md_data(ctx);
struct ossl_gost_imit_ctx *c = GOST_digest_ctx_data(ctx);
memset(c->buffer, 0, sizeof(c->buffer));
memset(c->partial_block, 0, sizeof(c->partial_block));
c->count = 0;
Expand All @@ -1525,12 +1523,12 @@ static int gost_imit_init(EVP_MD_CTX *ctx, gost_subst_block * block)
return 1;
}

static int gost_imit_init_cpa(EVP_MD_CTX *ctx)
static int gost_imit_init_cpa(GOST_digest_ctx *ctx)
{
return gost_imit_init(ctx, &Gost28147_CryptoProParamSetA);
}

static int gost_imit_init_cp_12(EVP_MD_CTX *ctx)
static int gost_imit_init_cp_12(GOST_digest_ctx *ctx)
{
return gost_imit_init(ctx, &Gost28147_TC26ParamSetZ);
}
Expand All @@ -1551,9 +1549,9 @@ static void mac_block_mesh(struct ossl_gost_imit_ctx *c,
c->count = c->count % 1024 + 8;
}

static int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count)
static int gost_imit_update(GOST_digest_ctx *ctx, const void *data, size_t count)
{
struct ossl_gost_imit_ctx *c = EVP_MD_CTX_md_data(ctx);
struct ossl_gost_imit_ctx *c = GOST_digest_ctx_data(ctx);
const unsigned char *p = data;
size_t bytes = count;
if (!(c->key_set)) {
Expand Down Expand Up @@ -1584,9 +1582,9 @@ static int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count)
return 1;
}

static int gost_imit_final(EVP_MD_CTX *ctx, unsigned char *md)
static int gost_imit_final(GOST_digest_ctx *ctx, unsigned char *md)
{
struct ossl_gost_imit_ctx *c = EVP_MD_CTX_md_data(ctx);
struct ossl_gost_imit_ctx *c = GOST_digest_ctx_data(ctx);
if (!c->key_set) {
GOSTerr(GOST_F_GOST_IMIT_FINAL, GOST_R_MAC_KEY_NOT_SET);
return 0;
Expand All @@ -1607,21 +1605,21 @@ static int gost_imit_final(EVP_MD_CTX *ctx, unsigned char *md)
return 1;
}

static int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
static int gost_imit_ctrl(GOST_digest_ctx *ctx, int type, int arg, void *ptr)
{
switch (type) {
case EVP_MD_CTRL_KEY_LEN:
*((unsigned int *)(ptr)) = 32;
return 1;
case EVP_MD_CTRL_SET_KEY:
{
struct ossl_gost_imit_ctx *gost_imit_ctx = EVP_MD_CTX_md_data(ctx);
struct ossl_gost_imit_ctx *gost_imit_ctx = GOST_digest_ctx_data(ctx);

if (EVP_MD_meth_get_init(EVP_MD_CTX_md(ctx)) (ctx) <= 0) {
if (GOST_digest_meth_get_init(GOST_digest_ctx_digest(ctx))(ctx) <= 0) {
GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET);
return 0;
}
EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NO_INIT);
GOST_digest_ctx_set_flags(ctx, EVP_MD_CTX_FLAG_NO_INIT);

if (arg == 0) {
struct gost_mac_key *key = (struct gost_mac_key *)ptr;
Expand Down Expand Up @@ -1649,7 +1647,7 @@ static int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
}
case EVP_MD_CTRL_XOF_LEN:
{
struct ossl_gost_imit_ctx *c = EVP_MD_CTX_md_data(ctx);
struct ossl_gost_imit_ctx *c = GOST_digest_ctx_data(ctx);
if (arg < 1 || arg > 8) {
GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE);
return 0;
Expand All @@ -1663,19 +1661,19 @@ static int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
}
}

static int gost_imit_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
static int gost_imit_copy(GOST_digest_ctx *to, const GOST_digest_ctx *from)
{
if (EVP_MD_CTX_md_data(to) && EVP_MD_CTX_md_data(from)) {
memcpy(EVP_MD_CTX_md_data(to), EVP_MD_CTX_md_data(from),
if (GOST_digest_ctx_data(to) && GOST_digest_ctx_data(from)) {
memcpy(GOST_digest_ctx_data(to), GOST_digest_ctx_data(from),
sizeof(struct ossl_gost_imit_ctx));
}
return 1;
}

/* Clean up imit ctx */
static int gost_imit_cleanup(EVP_MD_CTX *ctx)
static int gost_imit_cleanup(GOST_digest_ctx *ctx)
{
memset(EVP_MD_CTX_md_data(ctx), 0, sizeof(struct ossl_gost_imit_ctx));
OPENSSL_cleanse(GOST_digest_ctx_data(ctx), sizeof(struct ossl_gost_imit_ctx));
return 1;
}
/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */
105 changes: 103 additions & 2 deletions gost_digest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,106 @@
#include "gost_digest.h"
#include "gost_digest_details.h"

void* GOST_digest_ctx_data(const GOST_digest_ctx* ctx) {
return ctx->algctx;
#include <openssl/evp.h>

static int default_static_init(const GOST_digest_ctx *ctx) {
return 1;
}

static int default_static_deinit(const GOST_digest_ctx *ctx) {
return 1;
}

static int default_init(GOST_digest_ctx *ctx) {
return 1;
}

static int default_update(GOST_digest_ctx *ctx, const void *data, size_t count) {
return 1;
}

static int default_final(GOST_digest_ctx *ctx, unsigned char *md) {
return 1;
}

static int default_copy(GOST_digest_ctx *to, const GOST_digest_ctx *from) {
return 1;
}

static int default_cleanup(GOST_digest_ctx *ctx){
return 1;
}

static int default_ctrl(GOST_digest_ctx *ctx, int cmd, int p1, void *p2) {
return -2;
}

#define THIS_OR_BASE(st, field) \
THIS_OR_BASE_OR_DEFAULT(st, field, 0)

#define THIS_OR_BASE_OR_DEFAULT(st, field, dflt) ( \
((st)->field) ? ((st)->field) : BASE_VAL(st, field, dflt) \
)

#define BASE_VAL(st, field, dflt) ( \
(((st)->base && (st)->base->field) ? (st)->base->field : dflt) \
)

const GOST_digest* GOST_digest_init(GOST_digest* d) {
if (d->this) {
return d->this;
}

d->nid = THIS_OR_BASE(d, nid);
d->result_size = THIS_OR_BASE(d, result_size);
d->input_blocksize = THIS_OR_BASE(d, input_blocksize);
d->flags = THIS_OR_BASE(d, flags);
d->alias = THIS_OR_BASE(d, alias);

d->algctx_size = THIS_OR_BASE(d, algctx_size);

d->init = THIS_OR_BASE_OR_DEFAULT(d, init, default_init);
d->update = THIS_OR_BASE_OR_DEFAULT(d, update, default_update);
d->final = THIS_OR_BASE_OR_DEFAULT(d, final, default_final);
d->copy = THIS_OR_BASE_OR_DEFAULT(d, copy, default_copy);
d->cleanup = THIS_OR_BASE_OR_DEFAULT(d, cleanup, default_cleanup);
d->ctrl = THIS_OR_BASE_OR_DEFAULT(d, ctrl, default_ctrl);

if (d->alias)
EVP_add_digest_alias(OBJ_nid2sn(d->nid), d->alias);

d->this = d;

return d;
}

void GOST_digest_deinit(GOST_digest* d) {
if (!d->this) {
return;
}

if (d->alias)
EVP_delete_digest_alias(d->alias);

d->this = NULL;
}

unsigned long GOST_digest_flags(const GOST_digest* d) {
return d->flags;
}

int GOST_digest_type(const GOST_digest* d) {
return d->nid;
}

int GOST_digest_block_size(const GOST_digest* d) {
return d->input_blocksize;
}

int GOST_digest_size(const GOST_digest* d) {
return d->result_size;
}

int (*GOST_digest_meth_get_init(const GOST_digest *d))(GOST_digest_ctx *) {
return d->init;
}
Loading
Loading