X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_crypt.c;h=23a99e4bb5ce6b4a3de4b8cfa1280f4b79c243a7;hb=e1fd432c3fd595871e1821360995d7d09faa9ead;hp=2bbdc6ccd67ab4103cfea257c72c38ec04511ec2;hpb=c98ba9d03213d0c63d6874539d59f7b55fbc3fae;p=openssl-gost%2Fengine.git diff --git a/gost_crypt.c b/gost_crypt.c index 2bbdc6c..23a99e4 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,11 +22,19 @@ 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, + const unsigned char *key, + const unsigned char *iv, int enc); /* 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); @@ -54,6 +63,29 @@ EVP_CIPHER cipher_gost = { NULL, }; +EVP_CIPHER cipher_gost_cbc = + { +#ifdef NID_gost89_cbc + NID_gost89_cbc +#else + NID_undef +#endif + , + 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 */ @@ -71,9 +103,32 @@ EVP_CIPHER cipher_gost_cpacnt = { NULL, }; +EVP_CIPHER cipher_gost_cpcnt_12 = { +#ifdef NID_gost89_cnt_12 + NID_gost89_cnt_12 +#else + NID_undef +#endif + , + 1, /* block_size */ + 32, /* key_size */ + 8, /* iv_len */ + EVP_CIPH_OFB_MODE | EVP_CIPH_NO_PADDING | + EVP_CIPH_CUSTOM_IV | EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT, + gost_cipher_init_cp_12, + gost_cipher_do_cnt, + gost_cipher_cleanup, + sizeof(struct ossl_gost_cipher_ctx), /* ctx_size */ + gost89_set_asn1_parameters, + gost89_get_asn1_parameters, + gost_cipher_ctl, + NULL, +}; + /* Implementation of GOST 28147-89 in MAC (imitovstavka) mode */ /* Init functions which set specific parameters */ static int gost_imit_init_cpa(EVP_MD_CTX *ctx); +static int gost_imit_init_cp_12(EVP_MD_CTX *ctx); /* process block of data */ static int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count); /* Return computed value */ @@ -102,6 +157,29 @@ EVP_MD imit_gost_cpa = { gost_imit_ctrl }; +EVP_MD imit_gost_cp_12 = { +#ifdef NID_gost_mac_12 + NID_gost_mac_12 +#else + NID_undef +#endif + , + NID_undef, + 4, + 0, + gost_imit_init_cp_12, + gost_imit_update, + gost_imit_final, + gost_imit_copy, + gost_imit_cleanup, + NULL, + NULL, + {0, 0, 0, 0, 0}, + 8, + sizeof(struct ossl_gost_imit_ctx), + gost_imit_ctrl +}; + /* * Correspondence between gost parameter OIDs and substitution blocks * NID field is filed by register_gost_NID function in engine.c @@ -117,7 +195,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, @@ -126,6 +203,7 @@ struct gost_cipher_info gost_cipher_list[] = { 1}, {NID_id_Gost28147_89_CryptoPro_D_ParamSet, &Gost28147_CryptoProParamSetD, 1}, + {NID_undef/*,NID_id_tc26_gost_28147_param_Z*/, &Gost28147_TC26ParamSetZ, 1}, {NID_id_Gost28147_89_TestParamSet, &Gost28147_TestParamSet, 1}, {NID_undef, NULL, 0} }; @@ -143,7 +221,7 @@ const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj) if (!obj) { const char *params = get_gost_engine_param(GOST_PARAM_CRYPT_PARAMS); if (!params || !strlen(params)) - return &gost_cipher_list[1]; + return &gost_cipher_list[4]; nid = OBJ_txt2nid(params); if (nid == NID_undef) { @@ -199,11 +277,13 @@ static int gost_cipher_init_param(EVP_CIPHER_CTX *ctx, return 1; } -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_cnt(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, + gost_subst_block * block) { struct ossl_gost_cipher_ctx *c = ctx->cipher_data; - gost_init(&(c->cctx), &Gost28147_CryptoProParamSetA); + gost_init(&(c->cctx), block); c->key_meshing = 1; c->count = 0; if (key) @@ -214,6 +294,19 @@ static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key, return 1; } +static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + return gost_cipher_init_cnt(ctx, key, iv, &Gost28147_CryptoProParamSetA); +} + +static int gost_cipher_init_cp_12(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc) +{ + return gost_cipher_init_cnt(ctx, key, iv, &Gost28147_TC26ParamSetZ); +} + /* Initializes EVP_CIPHER_CTX with default values */ int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc) @@ -222,6 +315,15 @@ 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 @@ -271,6 +373,47 @@ 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) + { + OPENSSL_assert(inl % 8 ==0); + 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; + 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) @@ -398,6 +541,14 @@ int gost_cipher_cleanup(EVP_CIPHER_CTX *ctx) int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) { switch (type) { + case EVP_CTRL_INIT: + { + struct ossl_gost_cipher_ctx *c = ctx->cipher_data; + if (c == NULL) { + return -1; + } + return gost_cipher_set_param(c, arg); + } case EVP_CTRL_RAND_KEY: { if (RAND_bytes((unsigned char *)ptr, ctx->key_len) <= 0) { @@ -409,7 +560,18 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) } case EVP_CTRL_PBE_PRF_NID: if (ptr) { - *((int *)ptr) = NID_id_HMACGostR3411_94; + const char *params = get_gost_engine_param(GOST_PARAM_PBE_PARAMS); + int nid = NID_id_tc26_hmac_gost_3411_2012_512; + + if (params) { + if (!strcmp("md_gost12_256", params)) + nid = NID_id_tc26_hmac_gost_3411_2012_256; + else if (!strcmp("md_gost12_512", params)) + nid = NID_id_tc26_hmac_gost_3411_2012_512; + else if (!strcmp("md_gost94", params)) + nid = NID_id_HMACGostR3411_94; + } + *((int *)ptr) = nid; return 1; } else { return 0; @@ -433,22 +595,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); @@ -458,7 +620,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); @@ -475,6 +637,8 @@ int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params) GOST_CIPHER_PARAMS *gcp = NULL; unsigned char *p; struct ossl_gost_cipher_ctx *c = ctx->cipher_data; + int nid; + if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE) { return ret; } @@ -490,7 +654,16 @@ int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params) GOSTerr(GOST_F_GOST89_GET_ASN1_PARAMETERS, GOST_R_INVALID_IV_LENGTH); return -1; } - if (!gost_cipher_set_param(c, OBJ_obj2nid(gcp->enc_param_set))) { + + nid = OBJ_obj2nid(gcp->enc_param_set); + if (nid == NID_undef) { + GOST_CIPHER_PARAMS_free(gcp); + GOSTerr(GOST_F_GOST89_GET_ASN1_PARAMETERS, + GOST_R_INVALID_CIPHER_PARAM_OID); + return -1; + } + + if (!gost_cipher_set_param(c, nid)) { GOST_CIPHER_PARAMS_free(gcp); return -1; } @@ -501,7 +674,7 @@ int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params) return 1; } -int gost_imit_init_cpa(EVP_MD_CTX *ctx) +static int gost_imit_init(EVP_MD_CTX *ctx, gost_subst_block * block) { struct ossl_gost_imit_ctx *c = ctx->md_data; memset(c->buffer, 0, sizeof(c->buffer)); @@ -509,10 +682,21 @@ int gost_imit_init_cpa(EVP_MD_CTX *ctx) c->count = 0; c->bytes_left = 0; c->key_meshing = 1; - gost_init(&(c->cctx), &Gost28147_CryptoProParamSetA); + c->dgst_size = 4; + gost_init(&(c->cctx), block); return 1; } +static int gost_imit_init_cpa(EVP_MD_CTX *ctx) +{ + return gost_imit_init(ctx, &Gost28147_CryptoProParamSetA); +} + +static int gost_imit_init_cp_12(EVP_MD_CTX *ctx) +{ + return gost_imit_init(ctx, &Gost28147_TC26ParamSetZ); +} + static void mac_block_mesh(struct ossl_gost_imit_ctx *c, const unsigned char *data) { @@ -581,7 +765,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; } @@ -594,7 +778,7 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) case EVP_MD_CTRL_SET_KEY: { if (arg != 32) { - GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_LENGTH); + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE); return 0; } @@ -604,6 +788,17 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) return 1; } + case EVP_MD_CTRL_MAC_LEN: + { + if (arg < 1 || arg > 8) { + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE); + return 0; + } + struct ossl_gost_imit_ctx *c = ctx->md_data; + c->dgst_size=arg; + return 1; + } + default: return 0; }