X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_keyexpimp.c;h=481d5b5c67853bc5aa8988f5a28b4c7062fa163c;hb=HEAD;hp=e8ee1ebedce5e9a129f7d1874a78109a6fc73234;hpb=a418dfa28b4c3432a6da7d01adc1038789ce209c;p=openssl-gost%2Fengine.git diff --git a/gost_keyexpimp.c b/gost_keyexpimp.c index e8ee1eb..481d5b5 100644 --- a/gost_keyexpimp.c +++ b/gost_keyexpimp.c @@ -1,11 +1,31 @@ -#include +/* + * 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 @@ -34,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); @@ -111,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); @@ -172,9 +207,9 @@ int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len, int iters, i = 0; unsigned char zero = 0; unsigned char *ptr = keyout; - HMAC_CTX *ctx = NULL; + 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(); @@ -196,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); @@ -226,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; @@ -256,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; @@ -271,3 +303,164 @@ int gost_tlstree(int cipher_nid, const unsigned char *in, unsigned char *out, return 1; } + +#define GOST_WRAP_FLAGS EVP_CIPH_CTRL_INIT | EVP_CIPH_WRAP_MODE | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_FLAG_DEFAULT_ASN1 + +#define MAGMA_MAC_WRAP_LEN 8 +#define KUZNYECHIK_MAC_WRAP_LEN 16 +#define MAX_MAC_WRAP_LEN KUZNYECHIK_MAC_WRAP_LEN +#define GOSTKEYLEN 32 +#define MAGMA_WRAPPED_KEY_LEN GOSTKEYLEN + MAGMA_MAC_WRAP_LEN +#define KUZNYECHIK_WRAPPED_KEY_LEN GOSTKEYLEN + KUZNYECHIK_MAC_WRAP_LEN +#define MAX_WRAPPED_KEY_LEN KUZNYECHIK_WRAPPED_KEY_LEN + +typedef struct { + unsigned char iv[8]; /* Max IV size is half of base cipher block length */ + unsigned char key[GOSTKEYLEN*2]; /* Combined cipher and mac keys */ + unsigned char wrapped[MAX_WRAPPED_KEY_LEN]; /* Max size */ + size_t wrap_count; +} GOST_WRAP_CTX; + +static int magma_wrap_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + GOST_WRAP_CTX *cctx = EVP_CIPHER_CTX_get_cipher_data(ctx); + memset(cctx->wrapped, 0, MAX_WRAPPED_KEY_LEN); + cctx->wrap_count = 0; + + if (iv) { + memset(cctx->iv, 0, 8); + memcpy(cctx->iv, iv, 4); + } + + if (key) { + memcpy(cctx->key, key, GOSTKEYLEN*2); + } + return 1; +} + +static int magma_wrap_do(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + GOST_WRAP_CTX *cctx = EVP_CIPHER_CTX_get_cipher_data(ctx); + int enc = EVP_CIPHER_CTX_encrypting(ctx) ? 1 : 0; + + if (out == NULL) + return GOSTKEYLEN; + + if (inl <= MAGMA_WRAPPED_KEY_LEN) { + if (cctx->wrap_count + inl > MAGMA_WRAPPED_KEY_LEN) + return -1; + + if (cctx->wrap_count + inl <= MAGMA_WRAPPED_KEY_LEN) + { + memcpy(cctx->wrapped+cctx->wrap_count, in, inl); + cctx->wrap_count += inl; + } + } + + if (cctx->wrap_count < MAGMA_WRAPPED_KEY_LEN) + return 0; + + if (enc) { +#if 0 + return gost_kexp15(cctx->key, 32, NID_magma_ctr, in, NID_magma_mac, + cctx->key, /* FIXME mac_key, */ cctx->iv, 4, out, &outl); +#endif + return -1; + } else { + 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; + } +} + +static int kuznyechik_wrap_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + GOST_WRAP_CTX *cctx = EVP_CIPHER_CTX_get_cipher_data(ctx); + memset(cctx->wrapped, 0, KUZNYECHIK_WRAPPED_KEY_LEN); + cctx->wrap_count = 0; + + if (iv) { + memset(cctx->iv, 0, 8); + memcpy(cctx->iv, iv, 8); + } + + if (key) { + memcpy(cctx->key, key, GOSTKEYLEN*2); + } + return 1; +} + +static int kuznyechik_wrap_do(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + GOST_WRAP_CTX *cctx = EVP_CIPHER_CTX_get_cipher_data(ctx); + int enc = EVP_CIPHER_CTX_encrypting(ctx) ? 1 : 0; + + if (out == NULL) + return GOSTKEYLEN; + + if (inl <= KUZNYECHIK_WRAPPED_KEY_LEN) { + if (cctx->wrap_count + inl > KUZNYECHIK_WRAPPED_KEY_LEN) + return -1; + + if (cctx->wrap_count + inl <= KUZNYECHIK_WRAPPED_KEY_LEN) + { + memcpy(cctx->wrapped+cctx->wrap_count, in, inl); + cctx->wrap_count += inl; + } + } + + if (cctx->wrap_count < KUZNYECHIK_WRAPPED_KEY_LEN) + return 0; + + if (enc) { +#if 0 + return gost_kexp15(cctx->key, 32, NID_magma_ctr, in, NID_magma_mac, + cctx->key, /* FIXME mac_key, */ cctx->iv, 4, out, &outl); +#endif + return -1; + } else { + return gost_kimp15(cctx->wrapped, cctx->wrap_count, NID_kuznyechik_ctr, + cctx->key+GOSTKEYLEN, NID_kuznyechik_mac, cctx->key, cctx->iv, 8, out) > 0 ? GOSTKEYLEN : 0; + } +} + +static int wrap_ctrl (EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) +{ + switch(type) + { + case EVP_CTRL_INIT: + EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW); + return 1; + default: + return -2; + } +} + +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 : */