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);
+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);
NULL,
};
-EVP_CIPHER cipher_gost_cbc =
- {
+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,
+ 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 */
+ 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,
EVP_CIPH_CBC_MODE);
}
-
/*
* Wrapper around gostcrypt function from gost89.c which perform key meshing
* when nesseccary
/* 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);
+ const unsigned char *in, size_t inl)
+{
unsigned char b[8];
- const unsigned char *in_ptr=in;
- unsigned char *out_ptr=out;
+ 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;
+ 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;
+ } 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;
}
+ 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)
} else {
return 0;
}
+#ifdef EVP_CTRL_SET_SBOX
+ case EVP_CTRL_SET_SBOX:
+ if (ptr) {
+ struct ossl_gost_cipher_ctx *c = ctx->cipher_data;
+ int nid;
+ int cur_meshing;
+ int ret;
+ if (c == NULL) {
+ return -1;
+ }
+
+ if (c->count != 0) {
+ return -1;
+ }
+
+ nid = OBJ_txt2nid(ptr);
+ if (nid == NID_undef) {
+ return 0;
+ }
+
+ cur_meshing = c->key_meshing;
+ ret = gost_cipher_set_param(c, nid);
+ c->key_meshing = cur_meshing;
+ return ret;
+ } else {
+ return 0;
+ }
+#endif
+#ifdef EVP_CTRL_KEY_MESH
+ case EVP_CTRL_KEY_MESH:
+ {
+ struct ossl_gost_cipher_ctx *c = ctx->cipher_data;
+
+ if (c == NULL) {
+ return -1;
+ }
+
+ if (c->count != 0) {
+ return -1;
+ }
+
+ c->key_meshing = arg;
+ return 1;
+ }
+#endif
default:
GOSTerr(GOST_F_GOST_CIPHER_CTL,
GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND);
GOST_CIPHER_PARAMS_free(gcp);
return -1;
}
- memcpy(ctx->oiv, gcp->iv->data, len);
+
+ {
+ ASN1_TYPE tmp;
+ tmp.value.octet_string = gcp->iv;
+ tmp.type = V_ASN1_OCTET_STRING;
+ EVP_CIPHER_get_asn1_iv(ctx, &tmp);
+ }
GOST_CIPHER_PARAMS_free(gcp);
return 1;
case EVP_MD_CTRL_SET_KEY:
{
- if (arg != 32) {
- GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE);
+ 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;
- return 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;
}
- struct ossl_gost_imit_ctx *c = ctx->md_data;
- c->dgst_size=arg;
+ c->dgst_size = arg;
return 1;
}
projects / openssl-gost / engine.git / blobdiff