X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_crypt.c;h=930d40adc76941aedef3479efb841c44d7e55801;hb=a430c355a1d2eff5df6c96c7b6f928a609c2dd73;hp=e248305f5441a4585778d1f25f4f0ae9a3ec91a6;hpb=b7834a0ee1405853dda1d85abd66634574982438;p=openssl-gost%2Fengine.git diff --git a/gost_crypt.c b/gost_crypt.c index e248305..930d40a 100644 --- a/gost_crypt.c +++ b/gost_crypt.c @@ -47,12 +47,12 @@ static int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params); static int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); static int magma_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc); + 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); + const unsigned char *in, size_t inl); static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl); + const unsigned char *in, size_t inl); static EVP_CIPHER *_hidden_Gost28147_89_cipher = NULL; const EVP_CIPHER *cipher_gost(void) @@ -152,8 +152,7 @@ const EVP_CIPHER *cipher_gost_cpacnt(void) gost89_set_asn1_parameters) || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_gost89_cnt, gost89_get_asn1_parameters) - || !EVP_CIPHER_meth_set_ctrl(_hidden_gost89_cnt, - gost_cipher_ctl))) { + || !EVP_CIPHER_meth_set_ctrl(_hidden_gost89_cnt, gost_cipher_ctl))) { EVP_CIPHER_meth_free(_hidden_gost89_cnt); _hidden_gost89_cnt = NULL; } @@ -209,8 +208,7 @@ const EVP_CIPHER *cipher_magma_ctr(void) EVP_CIPH_CUSTOM_IV | EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT) - || !EVP_CIPHER_meth_set_init(_hidden_magma_ctr, - magma_cipher_init) + || !EVP_CIPHER_meth_set_init(_hidden_magma_ctr, magma_cipher_init) || !EVP_CIPHER_meth_set_do_cipher(_hidden_magma_ctr, magma_cipher_do_ctr) || !EVP_CIPHER_meth_set_cleanup(_hidden_magma_ctr, @@ -222,8 +220,7 @@ const EVP_CIPHER *cipher_magma_ctr(void) gost89_set_asn1_parameters) || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_magma_ctr, gost89_get_asn1_parameters) - || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_ctr, - gost_cipher_ctl))) { + || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_ctr, gost_cipher_ctl))) { EVP_CIPHER_meth_free(_hidden_magma_ctr); _hidden_magma_ctr = NULL; } @@ -243,8 +240,7 @@ const EVP_CIPHER *cipher_magma_cbc(void) EVP_CIPH_CUSTOM_IV | EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT) - || !EVP_CIPHER_meth_set_init(_hidden_magma_cbc, - magma_cipher_init) + || !EVP_CIPHER_meth_set_init(_hidden_magma_cbc, magma_cipher_init) || !EVP_CIPHER_meth_set_do_cipher(_hidden_magma_cbc, magma_cipher_do_cbc) || !EVP_CIPHER_meth_set_cleanup(_hidden_magma_cbc, @@ -256,8 +252,7 @@ const EVP_CIPHER *cipher_magma_cbc(void) 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_set_ctrl(_hidden_magma_cbc, gost_cipher_ctl))) { EVP_CIPHER_meth_free(_hidden_magma_cbc); _hidden_magma_cbc = NULL; } @@ -306,8 +301,7 @@ EVP_MD *imit_gost_cpa(void) || !EVP_MD_meth_set_result_size(md, 4) || !EVP_MD_meth_set_input_blocksize(md, 8) || !EVP_MD_meth_set_app_datasize(md, - sizeof(struct - ossl_gost_imit_ctx)) + sizeof(struct ossl_gost_imit_ctx)) || !EVP_MD_meth_set_flags(md, 0) || !EVP_MD_meth_set_init(md, gost_imit_init_cpa) || !EVP_MD_meth_set_update(md, gost_imit_update) @@ -338,8 +332,7 @@ EVP_MD *imit_gost_cp_12(void) || !EVP_MD_meth_set_result_size(md, 4) || !EVP_MD_meth_set_input_blocksize(md, 8) || !EVP_MD_meth_set_app_datasize(md, - sizeof(struct - ossl_gost_imit_ctx)) + sizeof(struct ossl_gost_imit_ctx)) || !EVP_MD_meth_set_flags(md, 0) || !EVP_MD_meth_set_init(md, gost_imit_init_cp_12) || !EVP_MD_meth_set_update(md, gost_imit_update) @@ -431,8 +424,7 @@ const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj) static int gost_cipher_set_param(struct ossl_gost_cipher_ctx *c, int nid) { const struct gost_cipher_info *param; - param = - get_encryption_params((nid == NID_undef ? NULL : OBJ_nid2obj(nid))); + param = get_encryption_params((nid == NID_undef ? NULL : OBJ_nid2obj(nid))); if (!param) return 0; @@ -467,9 +459,9 @@ static int gost_cipher_init_param(EVP_CIPHER_CTX *ctx, } static int magma_cipher_init_param(EVP_CIPHER_CTX *ctx, - const unsigned char *key, - const unsigned char *iv, int enc, - int paramNID, int mode) + 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) { @@ -539,10 +531,10 @@ int gost_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key, /* Initializes EVP_CIPHER_CTX with default values */ int magma_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) + const unsigned char *iv, int enc) { return magma_cipher_init_param(ctx, key, iv, enc, NID_undef, - EVP_CIPH_CBC_MODE); + EVP_CIPH_CBC_MODE); } /* @@ -633,10 +625,10 @@ int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, /* MAGMA encryption in CBC mode */ int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl) + const unsigned char *in, size_t inl) { unsigned char b[8]; - unsigned char d[8]; + unsigned char d[8]; const unsigned char *in_ptr = in; unsigned char *out_ptr = out; int i; @@ -646,12 +638,12 @@ 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]; + 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[7 - i] = d[i]; } memcpy(iv, out_ptr, 8); out_ptr += 8; @@ -661,11 +653,11 @@ 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]; + 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]; + out_ptr[i] = iv[i] ^ b[7 - i]; } memcpy(iv, in_ptr, 8); out_ptr += 8; @@ -679,12 +671,12 @@ int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, /* increment counter (64-bit int) by 1 */ static void ctr64_inc(unsigned char *counter) { - inc_counter(counter, 8); + inc_counter(counter, 8); } /* MAGMA encryption in CTR mode */ static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl) + const unsigned char *in, size_t inl) { const unsigned char *in_ptr = in; unsigned char *out_ptr = out; @@ -698,7 +690,7 @@ static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, if (EVP_CIPHER_CTX_num(ctx)) { for (j = EVP_CIPHER_CTX_num(ctx), i = 0; j < 8 && i < inl; j++, i++, in_ptr++, out_ptr++) { - *out_ptr = buf[7-j] ^ (*in_ptr); + *out_ptr = buf[7 - j] ^ (*in_ptr); } if (j == 8) { EVP_CIPHER_CTX_set_num(ctx, 0); @@ -709,34 +701,34 @@ static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out, } /* Process full blocks */ - for (; i + 8 <= inl; i += 8, in_ptr += 8, out_ptr += 8) { - 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]; - } - ctr64_inc(iv); - } + for (; i + 8 <= inl; i += 8, in_ptr += 8, out_ptr += 8) { + 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]; + } + ctr64_inc(iv); + } /* Process the rest of plaintext */ if (i < inl) { - for (j = 0; j < 8; j++) { - b[7-j] = iv[j]; - } - gostcrypt(&(c->cctx), iv, buf); - ctr64_inc(iv); - for (j = 0; i < inl; j++, i++) { - out_ptr[j] = buf[7-j] ^ in_ptr[j]; - } - - EVP_CIPHER_CTX_set_num(ctx, j); + for (j = 0; j < 8; j++) { + b[7 - j] = iv[j]; + } + gostcrypt(&(c->cctx), iv, buf); + ctr64_inc(iv); + for (j = 0; i < inl; j++, i++) { + out_ptr[j] = buf[7 - j] ^ in_ptr[j]; + } + + EVP_CIPHER_CTX_set_num(ctx, j); } else { - EVP_CIPHER_CTX_set_num(ctx, 0); - } + EVP_CIPHER_CTX_set_num(ctx, 0); + } - return 1; + return 1; } /* GOST encryption in CFB mode */ @@ -861,9 +853,8 @@ static int gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out, /* Cleaning up of EVP_CIPHER_CTX */ int gost_cipher_cleanup(EVP_CIPHER_CTX *ctx) { - gost_destroy(& - ((struct ossl_gost_cipher_ctx *) - EVP_CIPHER_CTX_get_cipher_data(ctx))->cctx); + gost_destroy(&((struct ossl_gost_cipher_ctx *) + EVP_CIPHER_CTX_get_cipher_data(ctx))->cctx); EVP_CIPHER_CTX_set_app_data(ctx, NULL); return 1; } @@ -956,8 +947,7 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) return 1; } default: - GOSTerr(GOST_F_GOST_CIPHER_CTL, - GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND); + GOSTerr(GOST_F_GOST_CIPHER_CTL, GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND); return -1; } return 1; @@ -1158,8 +1148,7 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) return 1; case EVP_MD_CTRL_SET_KEY: { - struct ossl_gost_imit_ctx *gost_imit_ctx = - EVP_MD_CTX_md_data(ctx); + struct ossl_gost_imit_ctx *gost_imit_ctx = EVP_MD_CTX_md_data(ctx); if (EVP_MD_meth_get_init(EVP_MD_CTX_md(ctx)) (ctx) <= 0) { GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET); @@ -1171,8 +1160,7 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) 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)); + get_encryption_params(OBJ_nid2obj(key->mac_param_nid)); if (param == NULL) { GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_PARAMS);