X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_crypt.c;h=8132a1eaaffee8b3e899bbae60b362dc5d221113;hb=d0e97865ae0499feb63e751b4cb2478c44d93247;hp=a32d48947581b8ebc084bd6e98c0d56dcd8bbd27;hpb=cba16944bff9d8c5dcf37be641822cd3de6d2ec1;p=openssl-gost%2Fengine.git diff --git a/gost_crypt.c b/gost_crypt.c index a32d489..8132a1e 100644 --- a/gost_crypt.c +++ b/gost_crypt.c @@ -8,6 +8,7 @@ **********************************************************************/ #include #include "gost89.h" +#include #include #include "e_gost_err.h" #include "gost_lcl.h" @@ -21,6 +22,8 @@ static int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); +static int gost_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc); static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); static int gost_cipher_init_cp_12(EVP_CIPHER_CTX *ctx, @@ -29,6 +32,9 @@ static int gost_cipher_init_cp_12(EVP_CIPHER_CTX *ctx, /* Handles block of data in CFB mode */ static int gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl); +/* Handles block of data in CBC mode */ +static int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl); /* Handles block of data in CNT mode */ static int gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl); @@ -57,6 +63,23 @@ EVP_CIPHER cipher_gost = { NULL, }; +EVP_CIPHER cipher_gost_cbc = { + NID_gost89_cbc, + 8, /*block_size */ + 32, /*key_size */ + 8, /*iv_len */ + EVP_CIPH_CBC_MODE | + EVP_CIPH_CUSTOM_IV | EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT, + gost_cipher_init_cbc, + gost_cipher_do_cbc, + gost_cipher_cleanup, + sizeof(struct ossl_gost_cipher_ctx), /* ctx_size */ + gost89_set_asn1_parameters, + gost89_get_asn1_parameters, + gost_cipher_ctl, + NULL, +}; + EVP_CIPHER cipher_gost_cpacnt = { NID_gost89_cnt, 1, /* block_size */ @@ -156,7 +179,6 @@ struct gost_cipher_info gost_cipher_list[] = { /* * {NID_id_GostR3411_94_CryptoProParamSet,&GostR3411_94_CryptoProParamSet,0}, */ - {NID_id_Gost28147_89_cc, &GostR3411_94_CryptoProParamSet, 0}, {NID_id_Gost28147_89_CryptoPro_A_ParamSet, &Gost28147_CryptoProParamSetA, 1}, {NID_id_Gost28147_89_CryptoPro_B_ParamSet, &Gost28147_CryptoProParamSetB, @@ -182,8 +204,13 @@ const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj) struct gost_cipher_info *param; if (!obj) { const char *params = get_gost_engine_param(GOST_PARAM_CRYPT_PARAMS); - if (!params || !strlen(params)) - return &gost_cipher_list[5]; + if (!params || !strlen(params)) { + int i; + for (i = 0; gost_cipher_list[i].nid != NID_undef; i++) + if (gost_cipher_list[i].nid == NID_id_tc26_gost_28147_param_Z) + return &gost_cipher_list[i]; + return &gost_cipher_list[0]; + } nid = OBJ_txt2nid(params); if (nid == NID_undef) { @@ -277,6 +304,14 @@ int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, EVP_CIPH_CFB_MODE); } +/* Initializes EVP_CIPHER_CTX with default values */ +int gost_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + return gost_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 @@ -326,6 +361,42 @@ static void gost_cnt_next(void *ctx, unsigned char *iv, unsigned char *buf) c->count = c->count % 1024 + 8; } +/* GOST encryptoon in CBC mode */ +int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + unsigned char b[8]; + const unsigned char *in_ptr = in; + unsigned char *out_ptr = out; + int i; + struct ossl_gost_cipher_ctx *c = ctx->cipher_data; + OPENSSL_assert(inl % 8 == 0); + if (ctx->encrypt) { + while (inl > 0) { + for (i = 0; i < 8; i++) { + b[i] = ctx->iv[i] ^ in_ptr[i]; + } + gostcrypt(&(c->cctx), b, out_ptr); + memcpy(ctx->iv, out_ptr, 8); + out_ptr += 8; + in_ptr += 8; + inl -= 8; + } + } else { + while (inl > 0) { + gostdecrypt(&(c->cctx), in_ptr, b); + for (i = 0; i < 8; i++) { + out_ptr[i] = ctx->iv[i] ^ b[i]; + } + memcpy(ctx->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) @@ -464,8 +535,7 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) case EVP_CTRL_RAND_KEY: { if (RAND_bytes((unsigned char *)ptr, ctx->key_len) <= 0) { - GOSTerr(GOST_F_GOST_CIPHER_CTL, - GOST_R_RANDOM_GENERATOR_ERROR); + GOSTerr(GOST_F_GOST_CIPHER_CTL, GOST_R_RNG_ERROR); return -1; } break; @@ -507,22 +577,22 @@ int gost89_set_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params) GOST_CIPHER_PARAMS *gcp = GOST_CIPHER_PARAMS_new(); ASN1_OCTET_STRING *os = NULL; if (!gcp) { - GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY); + GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE); return 0; } if (!ASN1_OCTET_STRING_set(gcp->iv, ctx->iv, ctx->cipher->iv_len)) { GOST_CIPHER_PARAMS_free(gcp); - GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY); + GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE); return 0; } ASN1_OBJECT_free(gcp->enc_param_set); gcp->enc_param_set = OBJ_nid2obj(c->paramNID); len = i2d_GOST_CIPHER_PARAMS(gcp, NULL); - p = buf = (unsigned char *)OPENSSL_malloc(len); + p = buf = OPENSSL_malloc(len); if (!buf) { GOST_CIPHER_PARAMS_free(gcp); - GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY); + GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE); return 0; } i2d_GOST_CIPHER_PARAMS(gcp, &p); @@ -532,7 +602,7 @@ int gost89_set_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params) if (!os || !ASN1_OCTET_STRING_set(os, buf, len)) { OPENSSL_free(buf); - GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY); + GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE); return 0; } OPENSSL_free(buf); @@ -579,7 +649,12 @@ int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params) GOST_CIPHER_PARAMS_free(gcp); return -1; } - memcpy(ctx->oiv, gcp->iv->data, len); + + { + ASN1_TYPE tmp; + ASN1_TYPE_set(&tmp, V_ASN1_OCTET_STRING, gcp->iv); + EVP_CIPHER_get_asn1_iv(ctx, &tmp); + } GOST_CIPHER_PARAMS_free(gcp); @@ -594,6 +669,7 @@ static int gost_imit_init(EVP_MD_CTX *ctx, gost_subst_block * block) c->count = 0; c->bytes_left = 0; c->key_meshing = 1; + c->dgst_size = 4; gost_init(&(c->cctx), block); return 1; } @@ -676,7 +752,7 @@ int gost_imit_final(EVP_MD_CTX *ctx, unsigned char *md) } mac_block_mesh(c, c->partial_block); } - get_mac(c->buffer, 32, md); + get_mac(c->buffer, 8 * c->dgst_size, md); return 1; } @@ -688,17 +764,50 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) return 1; case EVP_MD_CTRL_SET_KEY: { - if (arg != 32) { - GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_LENGTH); + struct ossl_gost_imit_ctx *gost_imit_ctx = ctx->md_data; + + if (ctx->digest->init(ctx) <= 0) { + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET); return 0; } - - gost_key(&(((struct ossl_gost_imit_ctx *)(ctx->md_data))->cctx), - ptr); - ((struct ossl_gost_imit_ctx *)(ctx->md_data))->key_set = 1; + ctx->flags |= EVP_MD_CTX_FLAG_NO_INIT; + + if (arg == 0) { + struct gost_mac_key *key = (struct gost_mac_key *)ptr; + if (key->mac_param_nid != NID_undef) { + const struct gost_cipher_info *param = + get_encryption_params(OBJ_nid2obj + (key->mac_param_nid)); + if (param == NULL) { + GOSTerr(GOST_F_GOST_IMIT_CTRL, + GOST_R_INVALID_MAC_PARAMS); + return 0; + } + gost_init(&(gost_imit_ctx->cctx), param->sblock); + } + gost_key(&(gost_imit_ctx->cctx), key->key); + gost_imit_ctx->key_set = 1; + + return 1; + } else if (arg == 32) { + gost_key(&(gost_imit_ctx->cctx), ptr); + gost_imit_ctx->key_set = 1; + return 1; + } + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE); + return 0; + } + case EVP_MD_CTRL_MAC_LEN: + { + struct ossl_gost_imit_ctx *c = ctx->md_data; + if (arg < 1 || arg > 8) { + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE); + return 0; + } + c->dgst_size = arg; return 1; - } + default: return 0; }