X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_keyexpimp.c;h=d2c690c20c1f879f9576ebf4cb3bcb442c16518a;hb=41b4121253a9c0e8d82d3eebcfe728d5d43e1b51;hp=6df1b2a6168246b74f0fd26a1bb1522bd8a50d76;hpb=79c7bd611a48915dfc1e4796a38309120ce2dd39;p=openssl-gost%2Fengine.git diff --git a/gost_keyexpimp.c b/gost_keyexpimp.c index 6df1b2a..d2c690c 100644 --- a/gost_keyexpimp.c +++ b/gost_keyexpimp.c @@ -1,4 +1,8 @@ +#ifdef _WIN32 +#include +#else #include +#endif #include #include #include @@ -46,11 +50,11 @@ int gost_kexp15(const unsigned char *shared_key, const int shared_len, if (EVP_DigestInit_ex(mac, EVP_get_digestbynid(mac_nid), NULL) <= 0 || omac_imit_ctrl(mac, EVP_MD_CTRL_SET_KEY, 32, mac_key) <= 0 - || omac_imit_ctrl(mac, EVP_MD_CTRL_MAC_LEN, mac_len, NULL) <= 0 + || omac_imit_ctrl(mac, EVP_MD_CTRL_XOF_LEN, mac_len, NULL) <= 0 || EVP_DigestUpdate(mac, iv, ivlen) <= 0 || EVP_DigestUpdate(mac, shared_key, shared_len) <= 0 /* As we set MAC length directly, we should not allow overwriting it */ - || EVP_DigestFinal_ex(mac, mac_buf, NULL) <= 0) { + || EVP_DigestFinalXOF(mac, mac_buf, mac_len) <= 0) { GOSTerr(GOST_F_GOST_KEXP15, ERR_R_INTERNAL_ERROR); goto err; } @@ -139,11 +143,11 @@ int gost_kimp15(const unsigned char *expkey, const size_t expkeylen, if (EVP_DigestInit_ex(mac, EVP_get_digestbynid(mac_nid), NULL) <= 0 || omac_imit_ctrl(mac, EVP_MD_CTRL_SET_KEY, 32, mac_key) <= 0 - || omac_imit_ctrl(mac, EVP_MD_CTRL_MAC_LEN, mac_len, NULL) <= 0 + || omac_imit_ctrl(mac, EVP_MD_CTRL_XOF_LEN, mac_len, NULL) <= 0 || EVP_DigestUpdate(mac, iv, ivlen) <= 0 || EVP_DigestUpdate(mac, out, shared_len) <= 0 /* As we set MAC length directly, we should not allow overwriting it */ - || EVP_DigestFinal_ex(mac, mac_buf, NULL) <= 0) { + || EVP_DigestFinalXOF(mac, mac_buf, mac_len) <= 0) { GOSTerr(GOST_F_GOST_KIMP15, ERR_R_INTERNAL_ERROR); goto err; } @@ -172,7 +176,7 @@ 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); size_t len_repr_len = 4; @@ -271,3 +275,192 @@ 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; + } + return 1; +} + +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; + } +} + +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 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; +}