diff options
| author | Vitaly Chikunov <vt@altlinux.org> | 2020-05-12 02:34:54 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@users.noreply.github.com> | 2020-05-12 12:55:47 +0300 |
| commit | 02eb87cc43d7ef6cb7f49b3f023a185d3549bfef (patch) | |
| tree | ad1030928e6fb015ca138e88e0f5105cbf4be2db /gost_crypt.c | |
| parent | 2ed1909a235ade9dd9c99e9d2be4c32bca9a8396 (diff) | |
| download | gost-engine-02eb87cc43d7ef6cb7f49b3f023a185d3549bfef.zip gost-engine-02eb87cc43d7ef6cb7f49b3f023a185d3549bfef.tar.gz gost-engine-02eb87cc43d7ef6cb7f49b3f023a185d3549bfef.tar.bz2 | |
gost_crypt: Add magma_cbc_cipher
Diffstat (limited to 'gost_crypt.c')
| -rw-r--r-- | gost_crypt.c | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/gost_crypt.c b/gost_crypt.c index c1516d7..5f7e029 100644 --- a/gost_crypt.c +++ b/gost_crypt.c @@ -235,33 +235,24 @@ GOST_cipher magma_ctr_acpkm_omac_cipher = { .ctrl = magma_cipher_ctl_acpkm_omac, }; -static EVP_CIPHER *_hidden_magma_cbc = NULL; -const EVP_CIPHER *cipher_magma_cbc(void) -{ - if (_hidden_magma_cbc == NULL - && ((_hidden_magma_cbc = - EVP_CIPHER_meth_new(NID_magma_cbc, 8 /* block_size */ , - 32 /* key_size */ )) == NULL - || !EVP_CIPHER_meth_set_iv_length(_hidden_magma_cbc, 8) - || !EVP_CIPHER_meth_set_flags(_hidden_magma_cbc, - EVP_CIPH_CBC_MODE | - EVP_CIPH_CUSTOM_IV | - EVP_CIPH_RAND_KEY | - EVP_CIPH_ALWAYS_CALL_INIT) - || !EVP_CIPHER_meth_set_init(_hidden_magma_cbc, magma_cipher_init) - || !EVP_CIPHER_meth_set_do_cipher(_hidden_magma_cbc, - magma_cipher_do_cbc) - || !EVP_CIPHER_meth_set_cleanup(_hidden_magma_cbc, - gost_cipher_cleanup) - || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_magma_cbc, - sizeof(struct - ossl_gost_cipher_ctx)) - || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_cbc, magma_cipher_ctl))) { - EVP_CIPHER_meth_free(_hidden_magma_cbc); - _hidden_magma_cbc = NULL; - } - return _hidden_magma_cbc; -} +GOST_cipher magma_cbc_cipher = { + .nid = NID_magma_cbc, + .block_size = 8, + .key_len = 32, + .iv_len = 8, + .flags = EVP_CIPH_CBC_MODE | + EVP_CIPH_NO_PADDING | + EVP_CIPH_CUSTOM_IV | + EVP_CIPH_RAND_KEY | + EVP_CIPH_ALWAYS_CALL_INIT, + .init = magma_cipher_init, + .do_cipher = magma_cipher_do_cbc, + .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 = magma_cipher_ctl, +}; /* Implementation of GOST 28147-89 in MAC (imitovstavka) mode */ /* Init functions which set specific parameters */ |