From 841a7360b5c84b506620d0f28ae922f9694bff12 Mon Sep 17 00:00:00 2001 From: Vitaly Chikunov Date: Tue, 12 May 2020 01:28:04 +0300 Subject: [PATCH] gost_crypt: Rework cipher registration, add Gost28147_89_cipher --- gost_crypt.c | 88 +++++++++++++++++++++++++++++++--------------------- gost_eng.c | 33 +++++++++++++++----- gost_lcl.h | 27 +++++++++++++++- 3 files changed, 104 insertions(+), 44 deletions(-) diff --git a/gost_crypt.c b/gost_crypt.c index 2bede85..cc9be5e 100644 --- a/gost_crypt.c +++ b/gost_crypt.c @@ -1,6 +1,8 @@ /********************************************************************** - * gost_crypt.c * + * gost_crypt.c - Initialize all ciphers * + * * * Copyright (c) 2005-2006 Cryptocom LTD * + * Copyright (c) 2020 Chikunov Vitaly * * This file is distributed under the same license as OpenSSL * * * * OpenSSL interface to GOST 28147-89 cipher functions * @@ -67,43 +69,56 @@ static int magma_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params); static int magma_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); static int magma_cipher_ctl_acpkm_omac(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); -static EVP_CIPHER *_hidden_Gost28147_89_cipher = NULL; -const EVP_CIPHER *cipher_gost(void) +EVP_CIPHER *GOST_init_cipher(GOST_cipher *c) { - if (_hidden_Gost28147_89_cipher == NULL - && ((_hidden_Gost28147_89_cipher = - EVP_CIPHER_meth_new(NID_id_Gost28147_89, 1 /* block_size */ , - 32 /* key_size */ )) == NULL - || !EVP_CIPHER_meth_set_iv_length(_hidden_Gost28147_89_cipher, 8) - || !EVP_CIPHER_meth_set_flags(_hidden_Gost28147_89_cipher, - EVP_CIPH_CFB_MODE | - EVP_CIPH_NO_PADDING | - EVP_CIPH_CUSTOM_IV | - EVP_CIPH_RAND_KEY | - EVP_CIPH_ALWAYS_CALL_INIT) - || !EVP_CIPHER_meth_set_init(_hidden_Gost28147_89_cipher, - gost_cipher_init) - || !EVP_CIPHER_meth_set_do_cipher(_hidden_Gost28147_89_cipher, - gost_cipher_do_cfb) - || !EVP_CIPHER_meth_set_cleanup(_hidden_Gost28147_89_cipher, - gost_cipher_cleanup) - || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_Gost28147_89_cipher, - sizeof(struct - ossl_gost_cipher_ctx)) - || - !EVP_CIPHER_meth_set_set_asn1_params(_hidden_Gost28147_89_cipher, - gost89_set_asn1_parameters) - || - !EVP_CIPHER_meth_set_get_asn1_params(_hidden_Gost28147_89_cipher, - gost89_get_asn1_parameters) - || !EVP_CIPHER_meth_set_ctrl(_hidden_Gost28147_89_cipher, - gost_cipher_ctl))) { - EVP_CIPHER_meth_free(_hidden_Gost28147_89_cipher); - _hidden_Gost28147_89_cipher = NULL; + if (c->cipher) + return c->cipher; + + EVP_CIPHER *cipher; + if (!(cipher = EVP_CIPHER_meth_new(c->nid, c->block_size, c->key_len)) + || !EVP_CIPHER_meth_set_iv_length(cipher, c->iv_len) + || !EVP_CIPHER_meth_set_flags(cipher, c->flags) + || !EVP_CIPHER_meth_set_init(cipher, c->init) + || !EVP_CIPHER_meth_set_do_cipher(cipher, c->do_cipher) + || !EVP_CIPHER_meth_set_cleanup(cipher, c->cleanup) + || !EVP_CIPHER_meth_set_impl_ctx_size(cipher, c->ctx_size) + || !EVP_CIPHER_meth_set_set_asn1_params(cipher, c->set_asn1_parameters) + || !EVP_CIPHER_meth_set_get_asn1_params(cipher, c->get_asn1_parameters) + || !EVP_CIPHER_meth_set_ctrl(cipher, c->ctrl)) { + EVP_CIPHER_meth_free(cipher); + cipher = NULL; + } + c->cipher = cipher; + return c->cipher; +} + +void GOST_deinit_cipher(GOST_cipher *c) +{ + if (c->cipher) { + EVP_CIPHER_meth_free(c->cipher); + c->cipher = NULL; } - return _hidden_Gost28147_89_cipher; } +GOST_cipher Gost28147_89_cipher = { + .nid = NID_id_Gost28147_89, + .block_size = 1, + .key_len = 32, + .iv_len = 8, + .flags = EVP_CIPH_CFB_MODE | + EVP_CIPH_NO_PADDING | + EVP_CIPH_CUSTOM_IV | + EVP_CIPH_RAND_KEY | + EVP_CIPH_ALWAYS_CALL_INIT, + .init = gost_cipher_init, + .do_cipher = gost_cipher_do_cfb, + .cleanup = gost_cipher_cleanup, + .ctx_size = sizeof(struct ossl_gost_cipher_ctx), + .set_asn1_parameters = gost89_set_asn1_parameters, + .get_asn1_parameters = gost89_get_asn1_parameters, + .ctrl = gost_cipher_ctl, +}; + static EVP_CIPHER *_hidden_Gost28147_89_cbc = NULL; const EVP_CIPHER *cipher_gost_cbc(void) { @@ -340,8 +355,8 @@ const EVP_CIPHER *cipher_magma_cbc(void) void cipher_gost_destroy(void) { - EVP_CIPHER_meth_free(_hidden_Gost28147_89_cipher); - _hidden_Gost28147_89_cipher = NULL; + //EVP_CIPHER_meth_free(_hidden_Gost28147_89_cipher); + //_hidden_Gost28147_89_cipher = NULL; EVP_CIPHER_meth_free(_hidden_gost89_cnt); _hidden_gost89_cnt = NULL; EVP_CIPHER_meth_free(_hidden_Gost28147_89_cbc); @@ -1444,3 +1459,4 @@ int gost_imit_cleanup(EVP_MD_CTX *ctx) memset(EVP_MD_CTX_md_data(ctx), 0, sizeof(struct ossl_gost_imit_ctx)); return 1; } +/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */ diff --git a/gost_eng.c b/gost_eng.c index 78e609f..7997530 100644 --- a/gost_eng.c +++ b/gost_eng.c @@ -109,10 +109,12 @@ static struct gost_digest_minfo { static struct gost_cipher_minfo { int nid; const EVP_CIPHER *(*cipher)(void); + GOST_cipher *reg; } gost_cipher_array[] = { { NID_id_Gost28147_89, - cipher_gost, + NULL, + &Gost28147_89_cipher, }, { NID_gost89_cnt, @@ -279,9 +281,16 @@ static int gost_engine_destroy(ENGINE* e) { dinfo->destroy(); } - cipher_gost_destroy(); - cipher_gost_grasshopper_destroy(); - wrap_ciphers_destroy(); + struct gost_cipher_minfo *cinfo = gost_cipher_array; + for (; cinfo->nid; cinfo++) { + if (cinfo->reg) + GOST_deinit_cipher(cinfo->reg); + else + EVP_CIPHER_meth_free((EVP_CIPHER *)cinfo->cipher()); + } + + //cipher_gost_grasshopper_destroy(); + //wrap_ciphers_destroy(); gost_param_free(); @@ -363,9 +372,16 @@ static int bind_gost(ENGINE* e, const char* id) { goto end; struct gost_cipher_minfo *cinfo = gost_cipher_array; - for (; cinfo->nid; cinfo++) - if (!EVP_add_cipher(cinfo->cipher())) + for (; cinfo->nid; cinfo++) { + const EVP_CIPHER *cipher; + + if (cinfo->reg) + cipher = GOST_init_cipher(cinfo->reg); + else + cipher = cinfo->cipher(); + if (!EVP_add_cipher(cipher)) goto end; + } struct gost_digest_minfo *dinfo = gost_digest_array; for (; dinfo->nid; dinfo++) { @@ -430,7 +446,10 @@ static int gost_ciphers(ENGINE *e, const EVP_CIPHER **cipher, for (; info->nid; info++) if (nid == info->nid) { - *cipher = info->cipher(); + if (info->reg) + *cipher = GOST_init_cipher(info->reg); + else + *cipher = info->cipher(); return 1; } *cipher = NULL; diff --git a/gost_lcl.h b/gost_lcl.h index e693841..3bb8128 100644 --- a/gost_lcl.h +++ b/gost_lcl.h @@ -244,7 +244,6 @@ extern struct gost_cipher_info gost_cipher_list[]; /* Find encryption params from ASN1_OBJECT */ const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj); /* Implementation of GOST 28147-89 cipher in CFB and CNT modes */ -const EVP_CIPHER *cipher_gost(); const EVP_CIPHER *cipher_gost_cbc(); const EVP_CIPHER *cipher_gost_cpacnt(); const EVP_CIPHER *cipher_gost_cpcnt_12(); @@ -319,4 +318,30 @@ int pack_sign_cp(ECDSA_SIG *s, int order, unsigned char *sig, size_t *siglen); /* Get private key as BIGNUM from both 34.10-2001 keys*/ /* Returns pointer into EVP_PKEY structure */ BIGNUM *gost_get0_priv_key(const EVP_PKEY *pkey); + +/* Struct describing cipher and used for init/deinit.*/ +struct gost_cipher_st { + int nid; + EVP_CIPHER *cipher; + int block_size; /* (bytes) */ + int key_len; /* (bytes) */ + int iv_len; + int flags; + int (*init) (EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc); + int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl); + int (*cleanup)(EVP_CIPHER_CTX *); + int ctx_size; + int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); + int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); + int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr); +}; +typedef struct gost_cipher_st GOST_cipher; + +EVP_CIPHER *GOST_init_cipher(GOST_cipher *c); +void GOST_deinit_cipher(GOST_cipher *c); + +extern GOST_cipher Gost28147_89_cipher; #endif +/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */ -- 2.39.2