X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_crypt.c;h=0aa2ecf277b8066dfa9fdd5aef0c74ec1dd11d1e;hb=97b3db1ebf985b73718faaae6c425782d526d44f;hp=da78e396fd941acc40034f426e7cbd5f79ee3601;hpb=8c81c6fde1485fc27f88b4ffbcd8217a294c2215;p=openssl-gost%2Fengine.git diff --git a/gost_crypt.c b/gost_crypt.c index da78e39..0aa2ecf 100644 --- a/gost_crypt.c +++ b/gost_crypt.c @@ -54,6 +54,8 @@ static int magma_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int magma_cipher_init_ctr_acpkm_omac(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_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl); static int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl); static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, @@ -74,7 +76,7 @@ static int magma_cipher_ctl_acpkm_omac(EVP_CIPHER_CTX *ctx, int type, int arg, v * Note: that you cannot template 0 value. */ #define TPL(st,field) ( \ - ((st)->field) ?: TPL_VAL(st,field) \ + ((st)->field) ? ((st)->field) : TPL_VAL(st,field) \ ) #define TPL_VAL(st,field) ( \ @@ -187,8 +189,7 @@ GOST_cipher Gost28147_89_cnt_12_cipher = { static GOST_cipher magma_template_cipher = { .block_size = 8, .key_len = 32, - .iv_len = 8, - .flags = EVP_CIPH_CUSTOM_IV | + .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT, .cleanup = gost_cipher_cleanup, @@ -205,6 +206,7 @@ GOST_cipher magma_ctr_cipher = { .block_size = 1, .iv_len = 4, .flags = EVP_CIPH_CTR_MODE | + EVP_CIPH_CUSTOM_IV | EVP_CIPH_NO_PADDING, .init = magma_cipher_init, }; @@ -215,6 +217,7 @@ GOST_cipher magma_ctr_acpkm_cipher = { .block_size = 1, .iv_len = 4, .flags = EVP_CIPH_CTR_MODE | + EVP_CIPH_CUSTOM_IV | EVP_CIPH_NO_PADDING, .init = magma_cipher_init, }; @@ -225,6 +228,7 @@ GOST_cipher magma_ctr_acpkm_omac_cipher = { .block_size = 1, .iv_len = 4, .flags = EVP_CIPH_CTR_MODE | + EVP_CIPH_CUSTOM_IV | EVP_CIPH_NO_PADDING | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_CUSTOM_CIPHER | @@ -234,10 +238,20 @@ GOST_cipher magma_ctr_acpkm_omac_cipher = { .ctrl = magma_cipher_ctl_acpkm_omac, }; +GOST_cipher magma_ecb_cipher = { + .nid = NID_magma_ecb, + .template = &magma_template_cipher, + .flags = EVP_CIPH_ECB_MODE, + .init = magma_cipher_init, + .do_cipher = magma_cipher_do_ecb, +}; + GOST_cipher magma_cbc_cipher = { .nid = NID_magma_cbc, .template = &gost_template_cipher, - .flags = EVP_CIPH_CBC_MODE, + .iv_len = 8, + .flags = EVP_CIPH_CBC_MODE | + EVP_CIPH_CUSTOM_IV, .init = magma_cipher_init, .do_cipher = magma_cipher_do_cbc, }; @@ -592,6 +606,29 @@ static int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, return 1; } +/* MAGMA encryption in ECB mode */ +static int magma_cipher_do_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx); + if (EVP_CIPHER_CTX_encrypting(ctx)) { + while (inl > 0) { + magmacrypt(&(c->cctx), in, out); + out += 8; + in += 8; + inl -= 8; + } + } else { + while (inl > 0) { + magmadecrypt(&(c->cctx), in, out); + out += 8; + in += 8; + inl -= 8; + } + } + return 1; +} + /* MAGMA encryption in CBC mode */ static int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) @@ -607,13 +644,9 @@ static int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, 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]; + out_ptr[i] = iv[i] ^ in_ptr[i]; } + magmacrypt(&(c->cctx), out_ptr, out_ptr); memcpy(iv, out_ptr, 8); out_ptr += 8; in_ptr += 8; @@ -621,13 +654,10 @@ static int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, } } else { while (inl > 0) { - for (i = 0; i < 8; i++) { - d[7 - i] = in_ptr[i]; - } - gostdecrypt(&(c->cctx), d, b); + magmadecrypt(&(c->cctx), in_ptr, b); memcpy(d, in_ptr, 8); for (i = 0; i < 8; i++) { - out_ptr[i] = iv[i] ^ b[7 - i]; + out_ptr[i] = iv[i] ^ b[i]; } memcpy(iv, d, 8); out_ptr += 8; @@ -667,10 +697,9 @@ static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); unsigned int num = EVP_CIPHER_CTX_num(ctx); size_t blocks, i, lasted = inl; - unsigned char b[8]; /* Process partial blocks */ while ((num & MAGMA_BLOCK_MASK) && lasted) { - *out_ptr++ = *in_ptr++ ^ buf[7 - (num & MAGMA_BLOCK_MASK)]; + *out_ptr++ = *in_ptr++ ^ buf[num & MAGMA_BLOCK_MASK]; --lasted; num++; } @@ -679,12 +708,9 @@ static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, /* Process full blocks */ for (i = 0; i < blocks; i++) { apply_acpkm_magma(c, &num); + magmacrypt(&(c->cctx), iv, buf); for (j = 0; j < 8; j++) { - b[7 - j] = iv[j]; - } - gostcrypt(&(c->cctx), b, buf); - for (j = 0; j < 8; j++) { - out_ptr[j] = buf[7 - j] ^ in_ptr[j]; + out_ptr[j] = buf[j] ^ in_ptr[j]; } ctr64_inc(iv); c->count += MAGMA_BLOCK_SIZE; @@ -697,15 +723,12 @@ static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, /* Process the rest of plaintext */ if (lasted > 0) { apply_acpkm_magma(c, &num); - for (j = 0; j < 8; j++) { - b[7 - j] = iv[j]; - } - gostcrypt(&(c->cctx), b, buf); + magmacrypt(&(c->cctx), iv, buf); for (i = 0; i < lasted; i++) - out_ptr[i] = buf[7 - i] ^ in_ptr[i]; + out_ptr[i] = buf[i] ^ in_ptr[i]; ctr64_inc(iv); - c->count += j; + c->count += 8; num += lasted; } EVP_CIPHER_CTX_set_num(ctx, num);