X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_crypt.c;h=035a46a2071a64d9f9b0ab906a1b7dce12324060;hb=25729ddc501fecd873943450dec45e15d885c20f;hp=a15317127f94acab9b852fcc927b5642876ebba3;hpb=868ae7a730a86f9c1021ea766cd714f817cb934d;p=openssl-gost%2Fengine.git diff --git a/gost_crypt.c b/gost_crypt.c index a153171..035a46a 100644 --- a/gost_crypt.c +++ b/gost_crypt.c @@ -46,6 +46,11 @@ static int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params); /* Control function */ static int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); +static int magma_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc); +/* Handles block of data in CBC mode */ +static int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl); static EVP_CIPHER *_hidden_Gost28147_89_cipher = NULL; const EVP_CIPHER *cipher_gost(void) { @@ -187,6 +192,40 @@ const EVP_CIPHER *cipher_gost_cpcnt_12(void) return _hidden_gost89_cnt_12; } +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_cbc) + || !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_set_asn1_params(_hidden_magma_cbc, + gost89_set_asn1_parameters) + || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_magma_cbc, + gost89_get_asn1_parameters) + || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_cbc, + gost_cipher_ctl))) { + EVP_CIPHER_meth_free(_hidden_magma_cbc); + _hidden_magma_cbc = NULL; + } + return _hidden_magma_cbc; +} + void cipher_gost_destroy(void) { EVP_CIPHER_meth_free(_hidden_Gost28147_89_cipher); @@ -197,6 +236,8 @@ void cipher_gost_destroy(void) _hidden_Gost28147_89_cbc = NULL; EVP_CIPHER_meth_free(_hidden_gost89_cnt_12); _hidden_gost89_cnt_12 = NULL; + EVP_CIPHER_meth_free(_hidden_magma_cbc); + _hidden_magma_cbc = NULL; } /* Implementation of GOST 28147-89 in MAC (imitovstavka) mode */ @@ -385,6 +426,28 @@ static int gost_cipher_init_param(EVP_CIPHER_CTX *ctx, return 1; } +static int magma_cipher_init_param(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc, + int paramNID, int mode) +{ + struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx); + if (EVP_CIPHER_CTX_get_app_data(ctx) == NULL) { + if (!gost_cipher_set_param(c, NID_id_tc26_gost_28147_param_Z)) + return 0; + EVP_CIPHER_CTX_set_app_data(ctx, EVP_CIPHER_CTX_get_cipher_data(ctx)); + } + if (key) + magma_key(&(c->cctx), key); + if (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)); + return 1; +} + static int gost_cipher_init_cnt(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, @@ -434,6 +497,14 @@ int gost_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key, EVP_CIPH_CBC_MODE); } +/* Initializes EVP_CIPHER_CTX with default values */ +int magma_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + return magma_cipher_init_param(ctx, key, iv, enc, NID_undef, + EVP_CIPH_CBC_MODE); +} + /* * Wrapper around gostcrypt function from gost89.c which perform key meshing * when nesseccary @@ -483,7 +554,7 @@ static void gost_cnt_next(void *ctx, unsigned char *iv, unsigned char *buf) c->count = c->count % 1024 + 8; } -/* GOST encryptoon in CBC mode */ +/* GOST encryption in CBC mode */ int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) { @@ -520,6 +591,51 @@ int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, return 1; } +/* GOST encryption in CBC mode */ +int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + unsigned char b[8]; + unsigned char d[8]; + const unsigned char *in_ptr = in; + unsigned char *out_ptr = out; + int i; + struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx); + unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); + if (EVP_CIPHER_CTX_encrypting(ctx)) { + while (inl > 0) { + + for (i = 0; i < 8; i++) { + b[7-i] = iv[i] ^ in_ptr[i]; + } + gostcrypt(&(c->cctx), b, d); + + for (i = 0; i < 8; i++) { + out_ptr[7-i] = d[i]; + } + memcpy(iv, out_ptr, 8); + out_ptr += 8; + in_ptr += 8; + inl -= 8; + } + } else { + while (inl > 0) { + for (i = 0; i < 8; i++) { + d[7-i] = in_ptr[i]; + } + gostdecrypt(&(c->cctx), d, b); + for (i = 0; i < 8; i++) { + out_ptr[i] = iv[i] ^ b[7-i]; + } + memcpy(iv, in_ptr, 8); + out_ptr += 8; + in_ptr += 8; + inl -= 8; + } + } + return 1; +} + /* GOST encryption in CFB mode */ int gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) @@ -691,12 +807,6 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) } else { return 0; } - case EVP_CTRL_SET_SBOX: - if (ptr) { - struct ossl_gost_cipher_ctx *c = ctx->cipher_data; - int nid; - int cur_meshing; - int ret; case EVP_CTRL_SET_SBOX: if (ptr) {