X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_grasshopper_cipher.c;h=7ae50f587be59ea64f4684ddbeaa3a7a3e77ee1b;hb=55e5f36a939374caa891112fc22f59ae1ab64bbc;hp=e78fae747db56dca65fc677e00a7b4d27425afbd;hpb=ae390d45207aadb69eb96d8c11c1ee888f70815f;p=openssl-gost%2Fengine.git diff --git a/gost_grasshopper_cipher.c b/gost_grasshopper_cipher.c index e78fae7..7ae50f5 100644 --- a/gost_grasshopper_cipher.c +++ b/gost_grasshopper_cipher.c @@ -3,10 +3,6 @@ * This file is distributed under the same license as OpenSSL */ -#if defined(__cplusplus) -extern "C" { -#endif - #include "gost_grasshopper_cipher.h" #include "gost_grasshopper_defines.h" #include "gost_grasshopper_math.h" @@ -29,17 +25,19 @@ enum GRASSHOPPER_CIPHER_TYPE { GRASSHOPPER_CIPHER_CTRACPKM, }; -static EVP_CIPHER* gost_grasshopper_ciphers[6] = { - [GRASSHOPPER_CIPHER_ECB] = NULL, - [GRASSHOPPER_CIPHER_CBC] = NULL, - [GRASSHOPPER_CIPHER_OFB] = NULL, - [GRASSHOPPER_CIPHER_CFB] = NULL, - [GRASSHOPPER_CIPHER_CTR] = NULL, - [GRASSHOPPER_CIPHER_CTRACPKM] = NULL, +static EVP_CIPHER *gost_grasshopper_ciphers[6] = { + [GRASSHOPPER_CIPHER_ECB] = NULL, + [GRASSHOPPER_CIPHER_CBC] = NULL, + [GRASSHOPPER_CIPHER_OFB] = NULL, + [GRASSHOPPER_CIPHER_CFB] = NULL, + [GRASSHOPPER_CIPHER_CTR] = NULL, + [GRASSHOPPER_CIPHER_CTRACPKM] = NULL, }; -static GRASSHOPPER_INLINE void gost_grasshopper_cipher_destroy_ofb(gost_grasshopper_cipher_ctx* c); -static GRASSHOPPER_INLINE void gost_grasshopper_cipher_destroy_ctr(gost_grasshopper_cipher_ctx* c); +static GRASSHOPPER_INLINE void +gost_grasshopper_cipher_destroy_ofb(gost_grasshopper_cipher_ctx * c); +static GRASSHOPPER_INLINE void +gost_grasshopper_cipher_destroy_ctr(gost_grasshopper_cipher_ctx * c); struct GRASSHOPPER_CIPHER_PARAMS { int nid; @@ -53,69 +51,69 @@ struct GRASSHOPPER_CIPHER_PARAMS { }; static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[6] = { - [GRASSHOPPER_CIPHER_ECB] = { - NID_grasshopper_ecb, - gost_grasshopper_cipher_init_ecb, - gost_grasshopper_cipher_do_ecb, - NULL, - 16, - sizeof(gost_grasshopper_cipher_ctx), - 0, - true - }, - [GRASSHOPPER_CIPHER_CBC] = { - NID_grasshopper_cbc, - gost_grasshopper_cipher_init_cbc, - gost_grasshopper_cipher_do_cbc, - NULL, - 16, - sizeof(gost_grasshopper_cipher_ctx), - 16, - true - }, - [GRASSHOPPER_CIPHER_OFB] = { - NID_grasshopper_ofb, - gost_grasshopper_cipher_init_ofb, - gost_grasshopper_cipher_do_ofb, - gost_grasshopper_cipher_destroy_ofb, - 1, - sizeof(gost_grasshopper_cipher_ctx_ofb), - 16, - false - }, - [GRASSHOPPER_CIPHER_CFB] = { - NID_grasshopper_cfb, - gost_grasshopper_cipher_init_cfb, - gost_grasshopper_cipher_do_cfb, - NULL, - 1, - sizeof(gost_grasshopper_cipher_ctx), - 16, - false - }, - [GRASSHOPPER_CIPHER_CTR] = { - NID_grasshopper_ctr, - gost_grasshopper_cipher_init_ctr, - gost_grasshopper_cipher_do_ctr, - gost_grasshopper_cipher_destroy_ctr, - 1, - sizeof(gost_grasshopper_cipher_ctx_ctr), - /* IV size is set to match full block, to make it responsibility of - * user to assign correct values (IV || 0), and to make naive context - * copy possible (for software such as openssh) */ - 16, - false - }, - [GRASSHOPPER_CIPHER_CTRACPKM] = { - NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm, - gost_grasshopper_cipher_init_ctracpkm, - gost_grasshopper_cipher_do_ctracpkm, - gost_grasshopper_cipher_destroy_ctr, - 1, - sizeof(gost_grasshopper_cipher_ctx_ctr), - 16, - false - }, + [GRASSHOPPER_CIPHER_ECB] = { + NID_grasshopper_ecb, + gost_grasshopper_cipher_init_ecb, + gost_grasshopper_cipher_do_ecb, + NULL, + 16, + sizeof(gost_grasshopper_cipher_ctx), + 0, + true} + , + [GRASSHOPPER_CIPHER_CBC] = { + NID_grasshopper_cbc, + gost_grasshopper_cipher_init_cbc, + gost_grasshopper_cipher_do_cbc, + NULL, + 16, + sizeof(gost_grasshopper_cipher_ctx), + 16, + true} + , + [GRASSHOPPER_CIPHER_OFB] = { + NID_grasshopper_ofb, + gost_grasshopper_cipher_init_ofb, + gost_grasshopper_cipher_do_ofb, + gost_grasshopper_cipher_destroy_ofb, + 1, + sizeof(gost_grasshopper_cipher_ctx_ofb), + 16, + false} + , + [GRASSHOPPER_CIPHER_CFB] = { + NID_grasshopper_cfb, + gost_grasshopper_cipher_init_cfb, + gost_grasshopper_cipher_do_cfb, + NULL, + 1, + sizeof(gost_grasshopper_cipher_ctx), + 16, + false} + , + [GRASSHOPPER_CIPHER_CTR] = { + NID_grasshopper_ctr, + gost_grasshopper_cipher_init_ctr, + gost_grasshopper_cipher_do_ctr, + gost_grasshopper_cipher_destroy_ctr, + 1, + sizeof(gost_grasshopper_cipher_ctx_ctr), + /* IV size is set to match full block, to make it responsibility of + * user to assign correct values (IV || 0), and to make naive context + * copy possible (for software such as openssh) */ + 16, + false} + , + [GRASSHOPPER_CIPHER_CTRACPKM] = { + NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm, + gost_grasshopper_cipher_init_ctracpkm, + gost_grasshopper_cipher_do_ctracpkm, + gost_grasshopper_cipher_destroy_ctr, + 1, + sizeof(gost_grasshopper_cipher_ctx_ctr), + 16, + false} + , }; /* first 256 bit of D from draft-irtf-cfrg-re-keying-12 */ @@ -126,7 +124,7 @@ static const unsigned char ACPKM_D_2018[] = { 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, /* 256 bit */ }; -static void acpkm_next(gost_grasshopper_cipher_ctx *c) +static void acpkm_next(gost_grasshopper_cipher_ctx * c) { unsigned char newkey[GRASSHOPPER_KEY_SIZE]; const int J = GRASSHOPPER_KEY_SIZE / GRASSHOPPER_BLOCK_SIZE; @@ -136,28 +134,47 @@ static void acpkm_next(gost_grasshopper_cipher_ctx *c) const unsigned char *D_n = &ACPKM_D_2018[n * GRASSHOPPER_BLOCK_SIZE]; grasshopper_encrypt_block(&c->encrypt_round_keys, - (grasshopper_w128_t *)D_n, - (grasshopper_w128_t *)&newkey[n * GRASSHOPPER_BLOCK_SIZE], - &c->buffer); + (grasshopper_w128_t *) D_n, + (grasshopper_w128_t *) & newkey[n * + GRASSHOPPER_BLOCK_SIZE], + &c->buffer); } gost_grasshopper_cipher_key(c, newkey); } /* Set 256 bit key into context */ -GRASSHOPPER_INLINE void gost_grasshopper_cipher_key(gost_grasshopper_cipher_ctx* c, const uint8_t* k) { - int i; +GRASSHOPPER_INLINE void +gost_grasshopper_cipher_key(gost_grasshopper_cipher_ctx * c, const uint8_t *k) +{ + int i; for (i = 0; i < 2; i++) { - grasshopper_copy128(&c->key.k.k[i], (const grasshopper_w128_t*) (k + i * 16)); + grasshopper_copy128(&c->key.k.k[i], + (const grasshopper_w128_t *)(k + i * 16)); } + grasshopper_set_encrypt_key(&c->encrypt_round_keys, &c->key); grasshopper_set_decrypt_key(&c->decrypt_round_keys, &c->key); } +/* Set master 256-bit key to be used in TLSTREE calculation into context */ +GRASSHOPPER_INLINE void +gost_grasshopper_master_key(gost_grasshopper_cipher_ctx * c, const uint8_t *k) +{ + int i; + for (i = 0; i < 2; i++) { + grasshopper_copy128(&c->master_key.k.k[i], + (const grasshopper_w128_t *)(k + i * 16)); + } +} + /* Cleans up key from context */ -GRASSHOPPER_INLINE void gost_grasshopper_cipher_destroy(gost_grasshopper_cipher_ctx* c) { - int i; +GRASSHOPPER_INLINE void +gost_grasshopper_cipher_destroy(gost_grasshopper_cipher_ctx * c) +{ + int i; for (i = 0; i < 2; i++) { grasshopper_zero128(&c->key.k.k[i]); + grasshopper_zero128(&c->master_key.k.k[i]); } for (i = 0; i < GRASSHOPPER_ROUND_KEYS_COUNT; i++) { grasshopper_zero128(&c->encrypt_round_keys.k[i]); @@ -168,21 +185,29 @@ GRASSHOPPER_INLINE void gost_grasshopper_cipher_destroy(gost_grasshopper_cipher_ grasshopper_zero128(&c->buffer); } -static GRASSHOPPER_INLINE void gost_grasshopper_cipher_destroy_ofb(gost_grasshopper_cipher_ctx* c) { - gost_grasshopper_cipher_ctx_ofb* ctx = (gost_grasshopper_cipher_ctx_ofb*) c; +static GRASSHOPPER_INLINE void +gost_grasshopper_cipher_destroy_ofb(gost_grasshopper_cipher_ctx * c) +{ + gost_grasshopper_cipher_ctx_ofb *ctx = + (gost_grasshopper_cipher_ctx_ofb *) c; grasshopper_zero128(&ctx->buffer1); } -static GRASSHOPPER_INLINE void gost_grasshopper_cipher_destroy_ctr(gost_grasshopper_cipher_ctx* c) { - gost_grasshopper_cipher_ctx_ctr* ctx = (gost_grasshopper_cipher_ctx_ctr*) c; +static GRASSHOPPER_INLINE void +gost_grasshopper_cipher_destroy_ctr(gost_grasshopper_cipher_ctx * c) +{ + gost_grasshopper_cipher_ctx_ctr *ctx = + (gost_grasshopper_cipher_ctx_ctr *) c; grasshopper_zero128(&ctx->partial_buffer); } -int gost_grasshopper_cipher_init(EVP_CIPHER_CTX* ctx, const unsigned char* key, - const unsigned char* iv, int enc) { - gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx); +int gost_grasshopper_cipher_init(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc) +{ + gost_grasshopper_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx); if (EVP_CIPHER_CTX_get_app_data(ctx) == NULL) { EVP_CIPHER_CTX_set_app_data(ctx, EVP_CIPHER_CTX_get_cipher_data(ctx)); @@ -190,42 +215,45 @@ int gost_grasshopper_cipher_init(EVP_CIPHER_CTX* ctx, const unsigned char* key, if (key != NULL) { gost_grasshopper_cipher_key(c, key); + gost_grasshopper_master_key(c, key); } if (iv != NULL) { - memcpy((unsigned char*) EVP_CIPHER_CTX_original_iv(ctx), iv, + memcpy((unsigned char *)EVP_CIPHER_CTX_original_iv(ctx), iv, EVP_CIPHER_CTX_iv_length(ctx)); } memcpy(EVP_CIPHER_CTX_iv_noconst(ctx), - EVP_CIPHER_CTX_original_iv(ctx), - EVP_CIPHER_CTX_iv_length(ctx)); + EVP_CIPHER_CTX_original_iv(ctx), EVP_CIPHER_CTX_iv_length(ctx)); grasshopper_zero128(&c->buffer); return 1; } -GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ecb(EVP_CIPHER_CTX* ctx, const unsigned char* key, - const unsigned char* iv, - int enc) { - gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx); +GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ecb(EVP_CIPHER_CTX *ctx, const unsigned char + *key, const unsigned char + *iv, int enc) +{ + gost_grasshopper_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx); c->type = GRASSHOPPER_CIPHER_ECB; return gost_grasshopper_cipher_init(ctx, key, iv, enc); } -GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_cbc(EVP_CIPHER_CTX* ctx, const unsigned char* key, - const unsigned char* iv, - int enc) { - gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx); +GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char + *key, const unsigned char + *iv, int enc) +{ + gost_grasshopper_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx); c->type = GRASSHOPPER_CIPHER_CBC; return gost_grasshopper_cipher_init(ctx, key, iv, enc); } -GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ofb(EVP_CIPHER_CTX* ctx, const unsigned char* key, - const unsigned char* iv, - int enc) { - gost_grasshopper_cipher_ctx_ofb* c = EVP_CIPHER_CTX_get_cipher_data(ctx); +GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ofb(EVP_CIPHER_CTX *ctx, const unsigned char + *key, const unsigned char + *iv, int enc) +{ + gost_grasshopper_cipher_ctx_ofb *c = EVP_CIPHER_CTX_get_cipher_data(ctx); c->c.type = GRASSHOPPER_CIPHER_OFB; @@ -234,18 +262,20 @@ GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ofb(EVP_CIPHER_CTX* ctx, con return gost_grasshopper_cipher_init(ctx, key, iv, enc); } -GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_cfb(EVP_CIPHER_CTX* ctx, const unsigned char* key, - const unsigned char* iv, - int enc) { - gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx); +GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_cfb(EVP_CIPHER_CTX *ctx, const unsigned char + *key, const unsigned char + *iv, int enc) +{ + gost_grasshopper_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx); c->type = GRASSHOPPER_CIPHER_CFB; return gost_grasshopper_cipher_init(ctx, key, iv, enc); } -GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ctr(EVP_CIPHER_CTX* ctx, const unsigned char* key, - const unsigned char* iv, - int enc) { - gost_grasshopper_cipher_ctx_ctr* c = EVP_CIPHER_CTX_get_cipher_data(ctx); +GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ctr(EVP_CIPHER_CTX *ctx, const unsigned char + *key, const unsigned char + *iv, int enc) +{ + gost_grasshopper_cipher_ctx_ctr *c = EVP_CIPHER_CTX_get_cipher_data(ctx); c->c.type = GRASSHOPPER_CIPHER_CTR; EVP_CIPHER_CTX_set_num(ctx, 0); @@ -255,44 +285,56 @@ GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ctr(EVP_CIPHER_CTX* ctx, con return gost_grasshopper_cipher_init(ctx, key, iv, enc); } -GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ctracpkm(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, - int enc) { +GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ctracpkm(EVP_CIPHER_CTX + *ctx, const unsigned + char *key, const unsigned + char *iv, int enc) +{ gost_grasshopper_cipher_ctx_ctr *c = EVP_CIPHER_CTX_get_cipher_data(ctx); /* NB: setting type makes EVP do_cipher callback useless */ c->c.type = GRASSHOPPER_CIPHER_CTRACPKM; EVP_CIPHER_CTX_set_num(ctx, 0); - c->section_size = 4096; + c->section_size = 4096; return gost_grasshopper_cipher_init(ctx, key, iv, enc); } -GRASSHOPPER_INLINE int gost_grasshopper_cipher_do(EVP_CIPHER_CTX* ctx, unsigned char* out, - const unsigned char* in, size_t inl) { - gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx); - struct GRASSHOPPER_CIPHER_PARAMS* params = &gost_cipher_params[c->type]; +GRASSHOPPER_INLINE int gost_grasshopper_cipher_do(EVP_CIPHER_CTX *ctx, + unsigned char *out, + const unsigned char *in, + size_t inl) +{ + gost_grasshopper_cipher_ctx *c = + (gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx); + struct GRASSHOPPER_CIPHER_PARAMS *params = &gost_cipher_params[c->type]; return params->do_cipher(ctx, out, in, inl); } -int gost_grasshopper_cipher_do_ecb(EVP_CIPHER_CTX* ctx, unsigned char* out, - const unsigned char* in, size_t inl) { - gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx); +int gost_grasshopper_cipher_do_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + gost_grasshopper_cipher_ctx *c = + (gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx); bool encrypting = (bool) EVP_CIPHER_CTX_encrypting(ctx); - const unsigned char* current_in = in; - unsigned char* current_out = out; + const unsigned char *current_in = in; + unsigned char *current_out = out; size_t blocks = inl / GRASSHOPPER_BLOCK_SIZE; size_t i; - for (i = 0; i < blocks; i++, current_in += GRASSHOPPER_BLOCK_SIZE, current_out += GRASSHOPPER_BLOCK_SIZE) { + for (i = 0; i < blocks; + i++, current_in += GRASSHOPPER_BLOCK_SIZE, current_out += + GRASSHOPPER_BLOCK_SIZE) { if (encrypting) { - grasshopper_encrypt_block(&c->encrypt_round_keys, (grasshopper_w128_t*) current_in, - (grasshopper_w128_t*) current_out, + grasshopper_encrypt_block(&c->encrypt_round_keys, + (grasshopper_w128_t *) current_in, + (grasshopper_w128_t *) current_out, &c->buffer); } else { - grasshopper_decrypt_block(&c->decrypt_round_keys, (grasshopper_w128_t*) current_in, - (grasshopper_w128_t*) current_out, + grasshopper_decrypt_block(&c->decrypt_round_keys, + (grasshopper_w128_t *) current_in, + (grasshopper_w128_t *) current_out, &c->buffer); } } @@ -300,39 +342,49 @@ int gost_grasshopper_cipher_do_ecb(EVP_CIPHER_CTX* ctx, unsigned char* out, return 1; } -int gost_grasshopper_cipher_do_cbc(EVP_CIPHER_CTX* ctx, unsigned char* out, - const unsigned char* in, size_t inl) { - gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx); - unsigned char* iv = EVP_CIPHER_CTX_iv_noconst(ctx); +int gost_grasshopper_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + gost_grasshopper_cipher_ctx *c = + (gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx); + unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); bool encrypting = (bool) EVP_CIPHER_CTX_encrypting(ctx); - const unsigned char* current_in = in; - unsigned char* current_out = out; - grasshopper_w128_t* currentInputBlock; - grasshopper_w128_t* currentOutputBlock; + const unsigned char *current_in = in; + unsigned char *current_out = out; + grasshopper_w128_t *currentInputBlock; + grasshopper_w128_t *currentOutputBlock; size_t blocks = inl / GRASSHOPPER_BLOCK_SIZE; size_t i; - grasshopper_w128_t* currentBlock; + grasshopper_w128_t *currentBlock; - currentBlock = (grasshopper_w128_t*) iv; + currentBlock = (grasshopper_w128_t *) iv; - for (i = 0; i < blocks; i++, current_in += GRASSHOPPER_BLOCK_SIZE, current_out += GRASSHOPPER_BLOCK_SIZE) { - currentInputBlock = (grasshopper_w128_t*) current_in; - currentOutputBlock = (grasshopper_w128_t*) current_out; + for (i = 0; i < blocks; + i++, current_in += GRASSHOPPER_BLOCK_SIZE, current_out += + GRASSHOPPER_BLOCK_SIZE) { + currentInputBlock = (grasshopper_w128_t *) current_in; + currentOutputBlock = (grasshopper_w128_t *) current_out; if (encrypting) { grasshopper_append128(currentBlock, currentInputBlock); - grasshopper_encrypt_block(&c->encrypt_round_keys, currentBlock, currentOutputBlock, &c->buffer); + grasshopper_encrypt_block(&c->encrypt_round_keys, currentBlock, + currentOutputBlock, &c->buffer); grasshopper_copy128(currentBlock, currentOutputBlock); } else { - grasshopper_decrypt_block(&c->decrypt_round_keys, currentInputBlock, currentOutputBlock, &c->buffer); + grasshopper_w128_t tmp; + + grasshopper_copy128(&tmp, currentInputBlock); + grasshopper_decrypt_block(&c->decrypt_round_keys, + currentInputBlock, currentOutputBlock, + &c->buffer); grasshopper_append128(currentOutputBlock, currentBlock); - grasshopper_copy128(currentBlock, currentInputBlock); + grasshopper_copy128(currentBlock, &tmp); } } return 1; } -void inc_counter(unsigned char* counter, size_t counter_bytes) +void inc_counter(unsigned char *counter, size_t counter_bytes) { unsigned char c; unsigned int n = counter_bytes; @@ -342,44 +394,50 @@ void inc_counter(unsigned char* counter, size_t counter_bytes) c = counter[n]; ++c; counter[n] = c; - if (c) return; + if (c) + return; } while (n); } /* increment counter (128-bit int) by 1 */ static void ctr128_inc(unsigned char *counter) { - inc_counter(counter, 16); + inc_counter(counter, 16); } -int gost_grasshopper_cipher_do_ctr(EVP_CIPHER_CTX* ctx, unsigned char* out, - const unsigned char* in, size_t inl) { - gost_grasshopper_cipher_ctx_ctr* c = (gost_grasshopper_cipher_ctx_ctr*) EVP_CIPHER_CTX_get_cipher_data(ctx); - unsigned char* iv = EVP_CIPHER_CTX_iv_noconst(ctx); - const unsigned char* current_in = in; - unsigned char* current_out = out; - grasshopper_w128_t* currentInputBlock; - grasshopper_w128_t* currentOutputBlock; +int gost_grasshopper_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + gost_grasshopper_cipher_ctx_ctr *c = (gost_grasshopper_cipher_ctx_ctr *) + EVP_CIPHER_CTX_get_cipher_data(ctx); + unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); + const unsigned char *current_in = in; + unsigned char *current_out = out; + grasshopper_w128_t *currentInputBlock; + grasshopper_w128_t *currentOutputBlock; unsigned int n = EVP_CIPHER_CTX_num(ctx); size_t lasted; size_t i; while (n && inl) { - *(current_out++) = *(current_in++) ^ c->partial_buffer.b[n]; - --inl; - n = (n + 1) % GRASSHOPPER_BLOCK_SIZE; + *(current_out++) = *(current_in++) ^ c->partial_buffer.b[n]; + --inl; + n = (n + 1) % GRASSHOPPER_BLOCK_SIZE; } EVP_CIPHER_CTX_set_num(ctx, n); size_t blocks = inl / GRASSHOPPER_BLOCK_SIZE; - grasshopper_w128_t* iv_buffer = (grasshopper_w128_t*) iv; + grasshopper_w128_t *iv_buffer = (grasshopper_w128_t *) iv; + grasshopper_w128_t tmp; // full parts for (i = 0; i < blocks; i++) { - currentInputBlock = (grasshopper_w128_t*) current_in; - currentOutputBlock = (grasshopper_w128_t*) current_out; - grasshopper_encrypt_block(&c->c.encrypt_round_keys, iv_buffer, currentOutputBlock, &c->c.buffer); - grasshopper_append128(currentOutputBlock, currentInputBlock); + currentInputBlock = (grasshopper_w128_t *) current_in; + currentOutputBlock = (grasshopper_w128_t *) current_out; + grasshopper_encrypt_block(&c->c.encrypt_round_keys, iv_buffer, + &c->partial_buffer, &c->c.buffer); + grasshopper_plus128(&tmp, &c->partial_buffer, currentInputBlock); + grasshopper_copy128(currentOutputBlock, &tmp); ctr128_inc(iv_buffer->b); current_in += GRASSHOPPER_BLOCK_SIZE; current_out += GRASSHOPPER_BLOCK_SIZE; @@ -388,13 +446,15 @@ int gost_grasshopper_cipher_do_ctr(EVP_CIPHER_CTX* ctx, unsigned char* out, // last part lasted = inl - blocks * GRASSHOPPER_BLOCK_SIZE; if (lasted > 0) { - currentInputBlock = (grasshopper_w128_t*) current_in; - currentOutputBlock = (grasshopper_w128_t*) current_out; - grasshopper_encrypt_block(&c->c.encrypt_round_keys, iv_buffer, &c->partial_buffer, &c->c.buffer); + currentInputBlock = (grasshopper_w128_t *) current_in; + currentOutputBlock = (grasshopper_w128_t *) current_out; + grasshopper_encrypt_block(&c->c.encrypt_round_keys, iv_buffer, + &c->partial_buffer, &c->c.buffer); for (i = 0; i < lasted; i++) { - currentOutputBlock->b[i] = c->partial_buffer.b[i] ^ currentInputBlock->b[i]; + currentOutputBlock->b[i] = + c->partial_buffer.b[i] ^ currentInputBlock->b[i]; } - EVP_CIPHER_CTX_set_num(ctx, i); + EVP_CIPHER_CTX_set_num(ctx, i); ctr128_inc(iv_buffer->b); } @@ -402,10 +462,10 @@ int gost_grasshopper_cipher_do_ctr(EVP_CIPHER_CTX* ctx, unsigned char* out, } #define GRASSHOPPER_BLOCK_MASK (GRASSHOPPER_BLOCK_SIZE - 1) -static inline void apply_acpkm_grasshopper(gost_grasshopper_cipher_ctx_ctr *ctx, unsigned int *num) +static inline void apply_acpkm_grasshopper(gost_grasshopper_cipher_ctx_ctr * + ctx, unsigned int *num) { - if (!ctx->section_size || - (*num < ctx->section_size)) + if (!ctx->section_size || (*num < ctx->section_size)) return; acpkm_next(&ctx->c); *num &= GRASSHOPPER_BLOCK_MASK; @@ -413,8 +473,10 @@ static inline void apply_acpkm_grasshopper(gost_grasshopper_cipher_ctx_ctr *ctx, /* If meshing is not configured via ctrl (setting section_size) * this function works exactly like plain ctr */ -int gost_grasshopper_cipher_do_ctracpkm(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl) { +int gost_grasshopper_cipher_do_ctracpkm(EVP_CIPHER_CTX *ctx, + unsigned char *out, + const unsigned char *in, size_t inl) +{ gost_grasshopper_cipher_ctx_ctr *c = EVP_CIPHER_CTX_get_cipher_data(ctx); unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); unsigned int num = EVP_CIPHER_CTX_num(ctx); @@ -426,15 +488,20 @@ int gost_grasshopper_cipher_do_ctracpkm(EVP_CIPHER_CTX *ctx, unsigned char *out, } size_t blocks = inl / GRASSHOPPER_BLOCK_SIZE; size_t i; + grasshopper_w128_t tmp; // full parts for (i = 0; i < blocks; i++) { apply_acpkm_grasshopper(c, &num); grasshopper_encrypt_block(&c->c.encrypt_round_keys, - (grasshopper_w128_t *)iv, (grasshopper_w128_t *)out, &c->c.buffer); - grasshopper_append128((grasshopper_w128_t *)out, (grasshopper_w128_t *)in); + (grasshopper_w128_t *) iv, + (grasshopper_w128_t *) & c->partial_buffer, + &c->c.buffer); + grasshopper_plus128(&tmp, &c->partial_buffer, + (grasshopper_w128_t *) in); + grasshopper_copy128((grasshopper_w128_t *) out, &tmp); ctr128_inc(iv); - in += GRASSHOPPER_BLOCK_SIZE; + in += GRASSHOPPER_BLOCK_SIZE; out += GRASSHOPPER_BLOCK_SIZE; num += GRASSHOPPER_BLOCK_SIZE; } @@ -444,7 +511,8 @@ int gost_grasshopper_cipher_do_ctracpkm(EVP_CIPHER_CTX *ctx, unsigned char *out, if (lasted > 0) { apply_acpkm_grasshopper(c, &num); grasshopper_encrypt_block(&c->c.encrypt_round_keys, - (grasshopper_w128_t *)iv, &c->partial_buffer, &c->c.buffer); + (grasshopper_w128_t *) iv, + &c->partial_buffer, &c->c.buffer); for (i = 0; i < lasted; i++) out[i] = c->partial_buffer.b[i] ^ in[i]; ctr128_inc(iv); @@ -458,45 +526,53 @@ int gost_grasshopper_cipher_do_ctracpkm(EVP_CIPHER_CTX *ctx, unsigned char *out, /* * Fixed 128-bit IV implementation make shift regiser redundant. */ -static void gost_grasshopper_cnt_next(gost_grasshopper_cipher_ctx_ofb* ctx, grasshopper_w128_t* iv, - grasshopper_w128_t* buf) { +static void gost_grasshopper_cnt_next(gost_grasshopper_cipher_ctx_ofb * ctx, + grasshopper_w128_t * iv, + grasshopper_w128_t * buf) +{ memcpy(&ctx->buffer1, iv, 16); - grasshopper_encrypt_block(&ctx->c.encrypt_round_keys, &ctx->buffer1, buf, &ctx->c.buffer); + grasshopper_encrypt_block(&ctx->c.encrypt_round_keys, &ctx->buffer1, + buf, &ctx->c.buffer); memcpy(iv, buf, 16); } -int gost_grasshopper_cipher_do_ofb(EVP_CIPHER_CTX* ctx, unsigned char* out, - const unsigned char* in, size_t inl) { - gost_grasshopper_cipher_ctx_ofb* c = (gost_grasshopper_cipher_ctx_ofb*) EVP_CIPHER_CTX_get_cipher_data(ctx); - const unsigned char* in_ptr = in; - unsigned char* out_ptr = out; - unsigned char* buf = EVP_CIPHER_CTX_buf_noconst(ctx); - unsigned char* iv = EVP_CIPHER_CTX_iv_noconst(ctx); +int gost_grasshopper_cipher_do_ofb(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + gost_grasshopper_cipher_ctx_ofb *c = (gost_grasshopper_cipher_ctx_ofb *) + EVP_CIPHER_CTX_get_cipher_data(ctx); + const unsigned char *in_ptr = in; + unsigned char *out_ptr = out; + unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx); + unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); int num = EVP_CIPHER_CTX_num(ctx); size_t i = 0; size_t j; /* process partial block if any */ if (num > 0) { - for (j = (size_t) num, i = 0; j < GRASSHOPPER_BLOCK_SIZE && i < inl; + for (j = (size_t)num, i = 0; j < GRASSHOPPER_BLOCK_SIZE && i < inl; j++, i++, in_ptr++, out_ptr++) { *out_ptr = buf[j] ^ (*in_ptr); } if (j == GRASSHOPPER_BLOCK_SIZE) { EVP_CIPHER_CTX_set_num(ctx, 0); } else { - EVP_CIPHER_CTX_set_num(ctx, (int) j); + EVP_CIPHER_CTX_set_num(ctx, (int)j); return 1; } } for (; i + GRASSHOPPER_BLOCK_SIZE < - inl; i += GRASSHOPPER_BLOCK_SIZE, in_ptr += GRASSHOPPER_BLOCK_SIZE, out_ptr += GRASSHOPPER_BLOCK_SIZE) { + inl; + i += GRASSHOPPER_BLOCK_SIZE, in_ptr += + GRASSHOPPER_BLOCK_SIZE, out_ptr += GRASSHOPPER_BLOCK_SIZE) { /* * block cipher current iv */ /* Encrypt */ - gost_grasshopper_cnt_next(c, (grasshopper_w128_t*) iv, (grasshopper_w128_t*) buf); + gost_grasshopper_cnt_next(c, (grasshopper_w128_t *) iv, + (grasshopper_w128_t *) buf); /* * xor next block of input text with it and output it @@ -511,11 +587,12 @@ int gost_grasshopper_cipher_do_ofb(EVP_CIPHER_CTX* ctx, unsigned char* out, /* Process rest of buffer */ if (i < inl) { - gost_grasshopper_cnt_next(c, (grasshopper_w128_t*) iv, (grasshopper_w128_t*) buf); + gost_grasshopper_cnt_next(c, (grasshopper_w128_t *) iv, + (grasshopper_w128_t *) buf); for (j = 0; i < inl; j++, i++) { out_ptr[j] = buf[j] ^ in_ptr[j]; } - EVP_CIPHER_CTX_set_num(ctx, (int) j); + EVP_CIPHER_CTX_set_num(ctx, (int)j); } else { EVP_CIPHER_CTX_set_num(ctx, 0); } @@ -523,13 +600,15 @@ int gost_grasshopper_cipher_do_ofb(EVP_CIPHER_CTX* ctx, unsigned char* out, return 1; } -int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX* ctx, unsigned char* out, - const unsigned char* in, size_t inl) { - gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx); - const unsigned char* in_ptr = in; - unsigned char* out_ptr = out; - unsigned char* buf = EVP_CIPHER_CTX_buf_noconst(ctx); - unsigned char* iv = EVP_CIPHER_CTX_iv_noconst(ctx); +int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + gost_grasshopper_cipher_ctx *c = + (gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx); + const unsigned char *in_ptr = in; + unsigned char *out_ptr = out; + unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx); + unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); bool encrypting = (bool) EVP_CIPHER_CTX_encrypting(ctx); int num = EVP_CIPHER_CTX_num(ctx); size_t i = 0; @@ -537,7 +616,8 @@ int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX* ctx, unsigned char* out, /* process partial block if any */ if (num > 0) { - for (j = (size_t) num, i = 0; j < GRASSHOPPER_BLOCK_SIZE && i < inl; j++, i++, in_ptr++, out_ptr++) { + for (j = (size_t)num, i = 0; j < GRASSHOPPER_BLOCK_SIZE && i < inl; + j++, i++, in_ptr++, out_ptr++) { if (!encrypting) { buf[j + GRASSHOPPER_BLOCK_SIZE] = *in_ptr; } @@ -550,18 +630,21 @@ int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX* ctx, unsigned char* out, memcpy(iv, buf + GRASSHOPPER_BLOCK_SIZE, GRASSHOPPER_BLOCK_SIZE); EVP_CIPHER_CTX_set_num(ctx, 0); } else { - EVP_CIPHER_CTX_set_num(ctx, (int) j); + EVP_CIPHER_CTX_set_num(ctx, (int)j); return 1; } } for (; i + GRASSHOPPER_BLOCK_SIZE < - inl; i += GRASSHOPPER_BLOCK_SIZE, in_ptr += GRASSHOPPER_BLOCK_SIZE, out_ptr += GRASSHOPPER_BLOCK_SIZE) { + inl; + i += GRASSHOPPER_BLOCK_SIZE, in_ptr += + GRASSHOPPER_BLOCK_SIZE, out_ptr += GRASSHOPPER_BLOCK_SIZE) { /* * block cipher current iv */ - grasshopper_encrypt_block(&c->encrypt_round_keys, (grasshopper_w128_t*) iv, (grasshopper_w128_t*) buf, - &c->buffer); + grasshopper_encrypt_block(&c->encrypt_round_keys, + (grasshopper_w128_t *) iv, + (grasshopper_w128_t *) buf, &c->buffer); /* * xor next block of input text with it and output it */ @@ -583,15 +666,16 @@ int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX* ctx, unsigned char* out, /* Process rest of buffer */ if (i < inl) { - grasshopper_encrypt_block(&c->encrypt_round_keys, (grasshopper_w128_t*) iv, (grasshopper_w128_t*) buf, - &c->buffer); + grasshopper_encrypt_block(&c->encrypt_round_keys, + (grasshopper_w128_t *) iv, + (grasshopper_w128_t *) buf, &c->buffer); if (!encrypting) { memcpy(buf + GRASSHOPPER_BLOCK_SIZE, in_ptr, inl - i); } for (j = 0; i < inl; j++, i++) { out_ptr[j] = buf[j] ^ in_ptr[j]; } - EVP_CIPHER_CTX_set_num(ctx, (int) j); + EVP_CIPHER_CTX_set_num(ctx, (int)j); if (encrypting) { memcpy(buf + GRASSHOPPER_BLOCK_SIZE, out_ptr, j); } @@ -602,9 +686,15 @@ int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX* ctx, unsigned char* out, return 1; } -int gost_grasshopper_cipher_cleanup(EVP_CIPHER_CTX* ctx) { - gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx); - struct GRASSHOPPER_CIPHER_PARAMS* params = &gost_cipher_params[c->type]; +int gost_grasshopper_cipher_cleanup(EVP_CIPHER_CTX *ctx) +{ + gost_grasshopper_cipher_ctx *c = + (gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx); + + if (!c) + return 1; + + struct GRASSHOPPER_CIPHER_PARAMS *params = &gost_cipher_params[c->type]; gost_grasshopper_cipher_destroy(c); if (params->destroy_cipher != NULL) { @@ -616,16 +706,18 @@ int gost_grasshopper_cipher_cleanup(EVP_CIPHER_CTX* ctx) { return 1; } -int gost_grasshopper_set_asn1_parameters(EVP_CIPHER_CTX* ctx, ASN1_TYPE* params) { +int gost_grasshopper_set_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params) +{ int len = 0; - unsigned char* buf = NULL; - ASN1_OCTET_STRING* os = NULL; + unsigned char *buf = NULL; + ASN1_OCTET_STRING *os = NULL; os = ASN1_OCTET_STRING_new(); if (!os || !ASN1_OCTET_STRING_set(os, buf, len)) { OPENSSL_free(buf); - GOSTerr(GOST_F_GOST_GRASSHOPPER_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE); + GOSTerr(GOST_F_GOST_GRASSHOPPER_SET_ASN1_PARAMETERS, + ERR_R_MALLOC_FAILURE); return 0; } OPENSSL_free(buf); @@ -634,7 +726,10 @@ int gost_grasshopper_set_asn1_parameters(EVP_CIPHER_CTX* ctx, ASN1_TYPE* params) return 1; } -GRASSHOPPER_INLINE int gost_grasshopper_get_asn1_parameters(EVP_CIPHER_CTX* ctx, ASN1_TYPE* params) { +GRASSHOPPER_INLINE int gost_grasshopper_get_asn1_parameters(EVP_CIPHER_CTX + *ctx, ASN1_TYPE + *params) +{ int ret = -1; if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE) { @@ -644,55 +739,127 @@ GRASSHOPPER_INLINE int gost_grasshopper_get_asn1_parameters(EVP_CIPHER_CTX* ctx, return 1; } -int gost_grasshopper_cipher_ctl(EVP_CIPHER_CTX* ctx, int type, int arg, void* ptr) { +int gost_grasshopper_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, + void *ptr) +{ switch (type) { - case EVP_CTRL_RAND_KEY: { - if (RAND_bytes((unsigned char*) ptr, EVP_CIPHER_CTX_key_length(ctx)) <= 0) { + case EVP_CTRL_RAND_KEY:{ + if (RAND_bytes + ((unsigned char *)ptr, EVP_CIPHER_CTX_key_length(ctx)) <= 0) { GOSTerr(GOST_F_GOST_GRASSHOPPER_CIPHER_CTL, GOST_R_RNG_ERROR); return -1; } break; } - case EVP_CTRL_KEY_MESH: { - gost_grasshopper_cipher_ctx_ctr *c = EVP_CIPHER_CTX_get_cipher_data(ctx); - if (c->c.type != GRASSHOPPER_CIPHER_CTRACPKM || - !arg || (arg % GRASSHOPPER_BLOCK_SIZE)) + case EVP_CTRL_KEY_MESH:{ + gost_grasshopper_cipher_ctx_ctr *c = + EVP_CIPHER_CTX_get_cipher_data(ctx); + if (c->c.type != GRASSHOPPER_CIPHER_CTRACPKM || !arg + || (arg % GRASSHOPPER_BLOCK_SIZE)) return -1; c->section_size = arg; break; } - default: - GOSTerr(GOST_F_GOST_GRASSHOPPER_CIPHER_CTL, GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND); +#ifdef EVP_CTRL_TLS1_2_TLSTREE + case EVP_CTRL_TLS1_2_TLSTREE: + { + unsigned char newkey[32]; + int mode = EVP_CIPHER_CTX_mode(ctx); + static const unsigned char zeroseq[8]; + gost_grasshopper_cipher_ctx_ctr *ctr_ctx = NULL; + gost_grasshopper_cipher_ctx *c = NULL; + + unsigned char adjusted_iv[16]; + unsigned char seq[8]; + int j; + if (mode != EVP_CIPH_CTR_MODE) return -1; + + ctr_ctx = (gost_grasshopper_cipher_ctx_ctr *) + EVP_CIPHER_CTX_get_cipher_data(ctx); + c = &(ctr_ctx->c); + + memcpy(seq, ptr, 8); + if (EVP_CIPHER_CTX_encrypting(ctx)) { + /* + * OpenSSL increments seq after mac calculation. + * As we have Mac-Then-Encrypt, we need decrement it here on encryption + * to derive the key correctly. + * */ + if (memcmp(seq, zeroseq, 8) != 0) + { + for(j=7; j>=0; j--) + { + if (seq[j] != 0) {seq[j]--; break;} + else seq[j] = 0xFF; + } + } + } + if (gost_tlstree(NID_grasshopper_cbc, c->master_key.k.b, newkey, + (const unsigned char *)seq) > 0) { + memset(adjusted_iv, 0, 16); + memcpy(adjusted_iv, EVP_CIPHER_CTX_original_iv(ctx), 8); + for(j=7; j>=0; j--) + { + int adj_byte, carry = 0; + adj_byte = adjusted_iv[j]+seq[j]+carry; + carry = (adj_byte > 255) ? 1 : 0; + adjusted_iv[j] = adj_byte & 0xFF; + } + EVP_CIPHER_CTX_set_num(ctx, 0); + memcpy(EVP_CIPHER_CTX_iv_noconst(ctx), adjusted_iv, 16); + + gost_grasshopper_cipher_key(c, newkey); + return 1; + } + } + return -1; +#endif + default: + GOSTerr(GOST_F_GOST_GRASSHOPPER_CIPHER_CTL, + GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND); + return -1; } return 1; } -GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper_create(int cipher_type, int block_size) { - return EVP_CIPHER_meth_new(cipher_type, - block_size /* block_size */, - GRASSHOPPER_KEY_SIZE /* key_size */); -} - -const int cipher_gost_grasshopper_setup(EVP_CIPHER* cipher, uint8_t mode, int iv_size, bool padding) { - return EVP_CIPHER_meth_set_iv_length(cipher, iv_size) && - EVP_CIPHER_meth_set_flags(cipher, (unsigned long) ( - mode | - ((!padding) ? EVP_CIPH_NO_PADDING : 0) | - ((iv_size > 0) ? EVP_CIPH_CUSTOM_IV : 0) | - EVP_CIPH_RAND_KEY | - EVP_CIPH_ALWAYS_CALL_INIT) - ) && - EVP_CIPHER_meth_set_cleanup(cipher, gost_grasshopper_cipher_cleanup) && - EVP_CIPHER_meth_set_set_asn1_params(cipher, gost_grasshopper_set_asn1_parameters) && - EVP_CIPHER_meth_set_get_asn1_params(cipher, gost_grasshopper_get_asn1_parameters) && - EVP_CIPHER_meth_set_ctrl(cipher, gost_grasshopper_cipher_ctl) && - EVP_CIPHER_meth_set_do_cipher(cipher, gost_grasshopper_cipher_do); +GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_create(int + cipher_type, int + block_size) +{ + return EVP_CIPHER_meth_new(cipher_type, block_size /* block_size */ , + GRASSHOPPER_KEY_SIZE /* key_size */ ); } -const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper(uint8_t mode, uint8_t num) { - EVP_CIPHER** cipher; - struct GRASSHOPPER_CIPHER_PARAMS* params; +const int cipher_gost_grasshopper_setup(EVP_CIPHER *cipher, uint8_t mode, + int iv_size, bool padding) +{ + return EVP_CIPHER_meth_set_iv_length(cipher, iv_size) + && EVP_CIPHER_meth_set_flags(cipher, + (unsigned long)(mode | + ((!padding) ? + EVP_CIPH_NO_PADDING : + 0) | ((iv_size > + 0) ? + EVP_CIPH_CUSTOM_IV + : 0) | + EVP_CIPH_RAND_KEY | + EVP_CIPH_ALWAYS_CALL_INIT) + ) + && EVP_CIPHER_meth_set_cleanup(cipher, gost_grasshopper_cipher_cleanup) + && EVP_CIPHER_meth_set_set_asn1_params(cipher, + gost_grasshopper_set_asn1_parameters) + && EVP_CIPHER_meth_set_get_asn1_params(cipher, + gost_grasshopper_get_asn1_parameters) + && EVP_CIPHER_meth_set_ctrl(cipher, gost_grasshopper_cipher_ctl) + && EVP_CIPHER_meth_set_do_cipher(cipher, gost_grasshopper_cipher_do); +} + +const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper(uint8_t mode, + uint8_t num) +{ + EVP_CIPHER **cipher; + struct GRASSHOPPER_CIPHER_PARAMS *params; cipher = &gost_grasshopper_ciphers[num]; @@ -711,9 +878,9 @@ const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper(uint8_t mode, uint8 return NULL; } - if (!cipher_gost_grasshopper_setup(*cipher, mode, iv_size, padding) || - !EVP_CIPHER_meth_set_init(*cipher, init_cipher) || - !EVP_CIPHER_meth_set_impl_ctx_size(*cipher, ctx_size)) { + if (!cipher_gost_grasshopper_setup(*cipher, mode, iv_size, padding) + || !EVP_CIPHER_meth_set_init(*cipher, init_cipher) + || !EVP_CIPHER_meth_set_impl_ctx_size(*cipher, ctx_size)) { EVP_CIPHER_meth_free(*cipher); *cipher = NULL; } @@ -722,28 +889,35 @@ const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper(uint8_t mode, uint8 return *cipher; } -const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper_ecb() { +const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ecb() +{ return cipher_gost_grasshopper(EVP_CIPH_ECB_MODE, GRASSHOPPER_CIPHER_ECB); } -const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper_cbc() { +const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_cbc() +{ return cipher_gost_grasshopper(EVP_CIPH_CBC_MODE, GRASSHOPPER_CIPHER_CBC); } -const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper_ofb() { +const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ofb() +{ return cipher_gost_grasshopper(EVP_CIPH_OFB_MODE, GRASSHOPPER_CIPHER_OFB); } -const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper_cfb() { +const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_cfb() +{ return cipher_gost_grasshopper(EVP_CIPH_CFB_MODE, GRASSHOPPER_CIPHER_CFB); } -const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper_ctr() { +const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ctr() +{ return cipher_gost_grasshopper(EVP_CIPH_CTR_MODE, GRASSHOPPER_CIPHER_CTR); } -const GRASSHOPPER_INLINE EVP_CIPHER* cipher_gost_grasshopper_ctracpkm() { - return cipher_gost_grasshopper(EVP_CIPH_CTR_MODE, GRASSHOPPER_CIPHER_CTRACPKM); +const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ctracpkm() +{ + return cipher_gost_grasshopper(EVP_CIPH_CTR_MODE, + GRASSHOPPER_CIPHER_CTRACPKM); } void cipher_gost_grasshopper_destroy(void) @@ -761,7 +935,3 @@ void cipher_gost_grasshopper_destroy(void) EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTRACPKM]); gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTRACPKM] = NULL; } - -#if defined(__cplusplus) -} -#endif