X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_keyexpimp.c;h=481d5b5c67853bc5aa8988f5a28b4c7062fa163c;hb=HEAD;hp=d2c690c20c1f879f9576ebf4cb3bcb442c16518a;hpb=359bc05a9d4ee696f3a025ac0d35d27c89ea62ac;p=openssl-gost%2Fengine.git diff --git a/gost_keyexpimp.c b/gost_keyexpimp.c index d2c690c..481d5b5 100644 --- a/gost_keyexpimp.c +++ b/gost_keyexpimp.c @@ -1,15 +1,31 @@ -#ifdef _WIN32 -#include -#else -#include -#endif +/* + * Copyright (c) 2019 Dmitry Belyavskiy + * Copyright (c) 2020 Vitaly Chikunov + * + * Contents licensed under the terms of the OpenSSL license + * See https://www.openssl.org/source/license.html for details + */ + #include #include #include +#include #include "gost_lcl.h" #include "e_gost_err.h" +static uint32_t be32(uint32_t host) +{ +#ifdef L_ENDIAN + return (host & 0xff000000) >> 24 | + (host & 0x00ff0000) >> 8 | + (host & 0x0000ff00) << 8 | + (host & 0x000000ff) << 24; +#else + return host; +#endif +} + int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr); /* * Function expects that out is a preallocated buffer of length @@ -38,6 +54,11 @@ int gost_kexp15(const unsigned char *shared_key, const int shared_len, goto err; } + if (shared_len + mac_len > (unsigned int)(*out_len)) { + GOSTerr(GOST_F_GOST_KEXP15, ERR_R_INTERNAL_ERROR); + goto err; + } + /* we expect IV of half length */ memset(iv_full, 0, 16); memcpy(iv_full, iv, ivlen); @@ -115,6 +136,16 @@ int gost_kimp15(const unsigned char *expkey, const size_t expkeylen, goto err; } + if (expkeylen > sizeof(out)) { + GOSTerr(GOST_F_GOST_KIMP15, ERR_R_INTERNAL_ERROR); + goto err; + } + + if (ivlen > 16) { + GOSTerr(GOST_F_GOST_KIMP15, ERR_R_INTERNAL_ERROR); + goto err; + } + /* we expect IV of half length */ memset(iv_full, 0, 16); memcpy(iv_full, iv, ivlen); @@ -178,7 +209,7 @@ int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len, unsigned char *ptr = keyout; HMAC_CTX *ctx; unsigned char *len_ptr = NULL; - uint32_t len_repr = htonl(keyout_len * 8); + uint32_t len_repr = be32(keyout_len * 8); size_t len_repr_len = 4; ctx = HMAC_CTX_new(); @@ -200,7 +231,7 @@ int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len, } for (i = 1; i <= iters; i++) { - uint32_t iter_net = htonl(i); + uint32_t iter_net = be32(i); unsigned char *rep_ptr = ((unsigned char *)&iter_net) + (4 - representation); @@ -230,17 +261,10 @@ int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len, int gost_tlstree(int cipher_nid, const unsigned char *in, unsigned char *out, const unsigned char *tlsseq) { -#ifndef L_ENDIAN - uint64_t gh_c1 = 0xFFFFFFFF00000000, gh_c2 = 0xFFFFFFFFFFF80000, - gh_c3 = 0xFFFFFFFFFFFFFFC0; - uint64_t mg_c1 = 0xFFFFFFC000000000, mg_c2 = 0xFFFFFFFFFE000000, - mg_c3 = 0xFFFFFFFFFFFFF000; -#else uint64_t gh_c1 = 0x00000000FFFFFFFF, gh_c2 = 0x0000F8FFFFFFFFFF, gh_c3 = 0xC0FFFFFFFFFFFFFF; uint64_t mg_c1 = 0x00000000C0FFFFFF, mg_c2 = 0x000000FEFFFFFFFF, mg_c3 = 0x00F0FFFFFFFFFFFF; -#endif uint64_t c1, c2, c3; uint64_t seed1, seed2, seed3; uint64_t seq; @@ -260,7 +284,11 @@ int gost_tlstree(int cipher_nid, const unsigned char *in, unsigned char *out, default: return 0; } +#ifndef L_ENDIAN + BUF_reverse((unsigned char *)&seq, tlsseq, 8); +#else memcpy(&seq, tlsseq, 8); +#endif seed1 = seq & c1; seed2 = seq & c2; seed3 = seq & c3; @@ -344,7 +372,6 @@ static int magma_wrap_do(EVP_CIPHER_CTX *ctx, unsigned char *out, return gost_kimp15(cctx->wrapped, cctx->wrap_count, NID_magma_ctr, cctx->key+GOSTKEYLEN, NID_magma_mac, cctx->key, cctx->iv, 4, out) > 0 ? GOSTKEYLEN : 0; } - return 1; } static int kuznyechik_wrap_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, @@ -400,7 +427,7 @@ static int kuznyechik_wrap_do(EVP_CIPHER_CTX *ctx, unsigned char *out, } } -int wrap_ctrl (EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) +static int wrap_ctrl (EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) { switch(type) { @@ -412,55 +439,28 @@ int wrap_ctrl (EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) } } -static EVP_CIPHER *hidden_magma_wrap_cipher, *hidden_kuznyechik_wrap_cipher; - -const EVP_CIPHER *cipher_magma_wrap(void) -{ - if (hidden_magma_wrap_cipher == NULL - && ((hidden_magma_wrap_cipher = - EVP_CIPHER_meth_new(NID_magma_kexp15, 8 /* block_size */ , - GOSTKEYLEN*2 /* key_size */ )) == NULL - || !EVP_CIPHER_meth_set_iv_length(hidden_magma_wrap_cipher, 4) - || !EVP_CIPHER_meth_set_flags(hidden_magma_wrap_cipher, GOST_WRAP_FLAGS) - || !EVP_CIPHER_meth_set_init(hidden_magma_wrap_cipher, magma_wrap_init) - || !EVP_CIPHER_meth_set_ctrl(hidden_magma_wrap_cipher, wrap_ctrl) - || !EVP_CIPHER_meth_set_do_cipher(hidden_magma_wrap_cipher, magma_wrap_do) - || !EVP_CIPHER_meth_set_impl_ctx_size(hidden_magma_wrap_cipher, sizeof(GOST_WRAP_CTX)) - || !EVP_add_cipher(hidden_magma_wrap_cipher) - )) { - EVP_CIPHER_meth_free(hidden_magma_wrap_cipher); - hidden_magma_wrap_cipher = NULL; - } - - return hidden_magma_wrap_cipher; -} - -const EVP_CIPHER *cipher_kuznyechik_wrap(void) -{ - if (hidden_kuznyechik_wrap_cipher == NULL - && ((hidden_kuznyechik_wrap_cipher = - EVP_CIPHER_meth_new(NID_kuznyechik_kexp15, 16 /* FIXME block_size */ , - GOSTKEYLEN*2 /* key_size */ )) == NULL - || !EVP_CIPHER_meth_set_iv_length(hidden_kuznyechik_wrap_cipher, 8) - || !EVP_CIPHER_meth_set_flags(hidden_kuznyechik_wrap_cipher, GOST_WRAP_FLAGS) - || !EVP_CIPHER_meth_set_init(hidden_kuznyechik_wrap_cipher, kuznyechik_wrap_init) - || !EVP_CIPHER_meth_set_ctrl(hidden_kuznyechik_wrap_cipher, wrap_ctrl) - || !EVP_CIPHER_meth_set_do_cipher(hidden_kuznyechik_wrap_cipher, kuznyechik_wrap_do) - || !EVP_CIPHER_meth_set_impl_ctx_size(hidden_kuznyechik_wrap_cipher, sizeof(GOST_WRAP_CTX)) - || !EVP_add_cipher(hidden_kuznyechik_wrap_cipher) - )) { - EVP_CIPHER_meth_free(hidden_kuznyechik_wrap_cipher); - hidden_kuznyechik_wrap_cipher = NULL; - } - - return hidden_kuznyechik_wrap_cipher; -} - -void wrap_ciphers_destroy(void) -{ - EVP_CIPHER_meth_free(hidden_magma_wrap_cipher); - hidden_magma_wrap_cipher = NULL; - - EVP_CIPHER_meth_free(hidden_kuznyechik_wrap_cipher); - hidden_kuznyechik_wrap_cipher = NULL; -} +static GOST_cipher wrap_template_cipher = { + .key_len = GOSTKEYLEN * 2, + .flags = GOST_WRAP_FLAGS, + .ctx_size = sizeof(GOST_WRAP_CTX), + .ctrl = wrap_ctrl, +}; + +GOST_cipher magma_kexp15_cipher = { + .template = &wrap_template_cipher, + .nid = NID_magma_kexp15, + .block_size = 8, + .iv_len = 4, + .init = magma_wrap_init, + .do_cipher = magma_wrap_do, +}; + +GOST_cipher kuznyechik_kexp15_cipher = { + .template = &wrap_template_cipher, + .nid = NID_kuznyechik_kexp15, + .block_size = 16, + .iv_len = 8, + .init = kuznyechik_wrap_init, + .do_cipher = kuznyechik_wrap_do, +}; +/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */