/*
* Maxim Tishkov 2016
+ * Copyright (c) 2020 Vitaly Chikunov <vt@altlinux.org>
* This file is distributed under the same license as OpenSSL
*/
GRASSHOPPER_CIPHER_CTRACPKMOMAC,
};
-static EVP_CIPHER *gost_grasshopper_ciphers[7] = {
- NULL, NULL, NULL, NULL, NULL, NULL, NULL
+static GOST_cipher grasshopper_template_cipher = {
+ .block_size = GRASSHOPPER_BLOCK_SIZE,
+ .key_len = GRASSHOPPER_KEY_SIZE,
+ .flags = EVP_CIPH_RAND_KEY |
+ EVP_CIPH_ALWAYS_CALL_INIT,
+ .cleanup = gost_grasshopper_cipher_cleanup,
+ .ctx_size = sizeof(gost_grasshopper_cipher_ctx),
+ .set_asn1_parameters = gost_grasshopper_set_asn1_parameters,
+ .get_asn1_parameters = gost_grasshopper_get_asn1_parameters,
+ .ctrl = gost_grasshopper_cipher_ctl,
};
-static GRASSHOPPER_INLINE void
-gost_grasshopper_cipher_destroy_ctr(gost_grasshopper_cipher_ctx * c);
-
-struct GRASSHOPPER_CIPHER_PARAMS {
- int nid;
- grasshopper_init_cipher_func init_cipher;
- grasshopper_do_cipher_func do_cipher;
- grasshopper_destroy_cipher_func destroy_cipher;
- int block_size;
- int ctx_size;
- int iv_size;
- bool padding;
- int extra_flags;
+GOST_cipher grasshopper_ecb_cipher = {
+ .nid = NID_grasshopper_ecb,
+ .template = &grasshopper_template_cipher,
+ .flags = EVP_CIPH_ECB_MODE,
+ .init = gost_grasshopper_cipher_init_ecb,
+ .do_cipher = gost_grasshopper_cipher_do_ecb,
+};
+
+GOST_cipher grasshopper_cbc_cipher = {
+ .nid = NID_grasshopper_cbc,
+ .template = &grasshopper_template_cipher,
+ .iv_len = 16,
+ .flags = EVP_CIPH_CBC_MODE |
+ EVP_CIPH_CUSTOM_IV,
+ .init = gost_grasshopper_cipher_init_cbc,
+ .do_cipher = gost_grasshopper_cipher_do_cbc,
+};
+
+GOST_cipher grasshopper_ofb_cipher = {
+ .nid = NID_grasshopper_ofb,
+ .template = &grasshopper_template_cipher,
+ .block_size = 1,
+ .iv_len = 16,
+ .flags = EVP_CIPH_OFB_MODE |
+ EVP_CIPH_NO_PADDING |
+ EVP_CIPH_CUSTOM_IV,
+ .init = gost_grasshopper_cipher_init_ofb,
+ .do_cipher = gost_grasshopper_cipher_do_ofb,
+};
+
+GOST_cipher grasshopper_cfb_cipher = {
+ .nid = NID_grasshopper_cfb,
+ .template = &grasshopper_template_cipher,
+ .block_size = 1,
+ .iv_len = 16,
+ .flags = EVP_CIPH_CFB_MODE |
+ EVP_CIPH_NO_PADDING |
+ EVP_CIPH_CUSTOM_IV,
+ .init = gost_grasshopper_cipher_init_cfb,
+ .do_cipher = gost_grasshopper_cipher_do_cfb,
+};
+
+GOST_cipher grasshopper_ctr_cipher = {
+ .nid = NID_grasshopper_ctr,
+ .template = &grasshopper_template_cipher,
+ .block_size = 1,
+ .iv_len = 8,
+ .flags = EVP_CIPH_CTR_MODE |
+ EVP_CIPH_NO_PADDING |
+ EVP_CIPH_CUSTOM_IV,
+ .init = gost_grasshopper_cipher_init_ctr,
+ .do_cipher = gost_grasshopper_cipher_do_ctr,
+ .ctx_size = sizeof(gost_grasshopper_cipher_ctx_ctr),
+};
+
+GOST_cipher grasshopper_ctr_acpkm_cipher = {
+ .nid = NID_kuznyechik_ctr_acpkm,
+ .template = &grasshopper_template_cipher,
+ .block_size = 1,
+ .iv_len = 8,
+ .flags = EVP_CIPH_CTR_MODE |
+ EVP_CIPH_NO_PADDING |
+ EVP_CIPH_CUSTOM_IV,
+ .init = gost_grasshopper_cipher_init_ctracpkm,
+ .do_cipher = gost_grasshopper_cipher_do_ctracpkm,
+ .ctx_size = sizeof(gost_grasshopper_cipher_ctx_ctr),
};
-static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[7] = {
- {
- NID_grasshopper_ecb,
- gost_grasshopper_cipher_init_ecb,
- gost_grasshopper_cipher_do_ecb,
- NULL,
- 16,
- sizeof(gost_grasshopper_cipher_ctx),
- 0,
- true,
- 0
- },
- {
- NID_grasshopper_cbc,
- gost_grasshopper_cipher_init_cbc,
- gost_grasshopper_cipher_do_cbc,
- NULL,
- 16,
- sizeof(gost_grasshopper_cipher_ctx),
- 16,
- true,
- 0
- },
- {
- NID_grasshopper_ofb,
- gost_grasshopper_cipher_init_ofb,
- gost_grasshopper_cipher_do_ofb,
- NULL,
- 1,
- sizeof(gost_grasshopper_cipher_ctx),
- 16,
- false,
- 0
- },
- {
- NID_grasshopper_cfb,
- gost_grasshopper_cipher_init_cfb,
- gost_grasshopper_cipher_do_cfb,
- NULL,
- 1,
- sizeof(gost_grasshopper_cipher_ctx),
- 16,
- false,
- 0
- },
- {
- NID_grasshopper_ctr,
- gost_grasshopper_cipher_init_ctr,
- gost_grasshopper_cipher_do_ctr,
- gost_grasshopper_cipher_destroy_ctr,
- 1,
- sizeof(gost_grasshopper_cipher_ctx_ctr),
- 8,
- false,
- 0
- },
- {
- NID_kuznyechik_ctr_acpkm,
- gost_grasshopper_cipher_init_ctracpkm,
- gost_grasshopper_cipher_do_ctracpkm,
- gost_grasshopper_cipher_destroy_ctr,
- 1,
- sizeof(gost_grasshopper_cipher_ctx_ctr),
- 8,
- false,
- 0
- },
- {
- NID_kuznyechik_ctr_acpkm_omac,
- gost_grasshopper_cipher_init_ctracpkm_omac,
- gost_grasshopper_cipher_do_ctracpkm_omac,
- gost_grasshopper_cipher_destroy_ctr,
- 1,
- sizeof(gost_grasshopper_cipher_ctx_ctr),
- 8,
- false,
- EVP_CIPH_FLAG_CUSTOM_CIPHER|EVP_CIPH_FLAG_CIPHER_WITH_MAC|EVP_CIPH_CUSTOM_COPY
- },
+GOST_cipher grasshopper_ctr_acpkm_omac_cipher = {
+ .nid = NID_kuznyechik_ctr_acpkm_omac,
+ .template = &grasshopper_template_cipher,
+ .block_size = 1,
+ .iv_len = 8,
+ .flags = EVP_CIPH_CTR_MODE |
+ EVP_CIPH_NO_PADDING |
+ EVP_CIPH_CUSTOM_IV |
+ EVP_CIPH_FLAG_CUSTOM_CIPHER |
+ EVP_CIPH_FLAG_CIPHER_WITH_MAC |
+ EVP_CIPH_CUSTOM_COPY,
+ .init = gost_grasshopper_cipher_init_ctracpkm_omac,
+ .do_cipher = gost_grasshopper_cipher_do_ctracpkm_omac,
+ .ctx_size = sizeof(gost_grasshopper_cipher_ctx_ctr),
};
/* first 256 bit of D from draft-irtf-cfrg-re-keying-12 */
if (EVP_CIPHER_CTX_get_app_data(ctx) == NULL) {
EVP_CIPHER_CTX_set_app_data(ctx, EVP_CIPHER_CTX_get_cipher_data(ctx));
+ if (enc && c->type == GRASSHOPPER_CIPHER_CTRACPKM) {
+ gost_grasshopper_cipher_ctx_ctr *ctr = EVP_CIPHER_CTX_get_cipher_data(ctx);
+ if (init_zero_kdf_seed(ctr->kdf_seed) == 0)
+ return -1;
+ }
}
if (key != NULL) {
c->section_size = 4096;
if (key) {
- unsigned char keys[64];
- const EVP_MD *md = EVP_get_digestbynid(NID_kuznyechik_mac);
- EVP_PKEY *mac_key;
-
- if (md == NULL)
- return 0;
-
- if (enc) {
- if (RAND_bytes(c->kdf_seed, 8) != 1)
- return 0;
- }
-
- if (gost_kdftree2012_256(keys, 64, key, 32, (const unsigned char *)"kdf tree", 8, c->kdf_seed, 8, 1) <= 0)
- return 0;
-
+ unsigned char cipher_key[32];
c->omac_ctx = EVP_MD_CTX_new();
- mac_key = EVP_PKEY_new_mac_key(NID_kuznyechik_mac, NULL, keys+32, 32);
- if (mac_key == NULL || c->omac_ctx == NULL) {
- EVP_PKEY_free(mac_key);
- return 0;
+ if (c->omac_ctx == NULL) {
+ GOSTerr(GOST_F_GOST_GRASSHOPPER_CIPHER_INIT_CTRACPKM_OMAC, ERR_R_MALLOC_FAILURE);
+ return 0;
}
- if (EVP_DigestInit_ex(c->omac_ctx, md, NULL) <= 0 ||
- EVP_DigestSignInit(c->omac_ctx, NULL, md, NULL, mac_key) <= 0) {
- EVP_PKEY_free(mac_key);
- return 0;
+ if (gost2015_acpkm_omac_init(NID_kuznyechik_mac, enc, key,
+ c->omac_ctx, cipher_key, c->kdf_seed) != 1) {
+ EVP_MD_CTX_free(c->omac_ctx);
+ c->omac_ctx = NULL;
+ return 0;
}
- EVP_PKEY_free(mac_key);
- return gost_grasshopper_cipher_init(ctx, keys, iv, enc);
+ return gost_grasshopper_cipher_init(ctx, cipher_key, iv, enc);
}
- return gost_grasshopper_cipher_init(ctx, key, iv, enc);
-}
-
-GRASSHOPPER_INLINE int gost_grasshopper_cipher_do(EVP_CIPHER_CTX *ctx,
- unsigned char *out,
- const unsigned char *in,
- size_t inl)
-{
- gost_grasshopper_cipher_ctx *c =
- (gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx);
- struct GRASSHOPPER_CIPHER_PARAMS *params = &gost_cipher_params[c->type];
- return params->do_cipher(ctx, out, in, inl);
+ return gost_grasshopper_cipher_init(ctx, key, iv, enc);
}
int gost_grasshopper_cipher_do_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out,
int gost_grasshopper_cipher_cleanup(EVP_CIPHER_CTX *ctx)
{
- struct GRASSHOPPER_CIPHER_PARAMS *params;
gost_grasshopper_cipher_ctx *c =
(gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx);
if (!c)
return 1;
- params = &gost_cipher_params[c->type];
-
- gost_grasshopper_cipher_destroy(c);
- if (params->destroy_cipher != NULL) {
- params->destroy_cipher(c);
- }
+ if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_CTR_MODE)
+ gost_grasshopper_cipher_destroy_ctr(c);
EVP_CIPHER_CTX_set_app_data(ctx, NULL);
return 0;
}
-int gost_grasshopper_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg,
- void *ptr)
+int gost_grasshopper_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
{
switch (type) {
case EVP_CTRL_RAND_KEY:{
}
#endif
case EVP_CTRL_PROCESS_UNPROTECTED:
- {
- gost_grasshopper_cipher_ctx_ctr *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
- ASN1_OBJECT *cmsmacobj = NULL;
- if (c->c.type != GRASSHOPPER_CIPHER_CTRACPKMOMAC)
- return -1;
- cmsmacobj = OBJ_txt2obj(OID_GOST_CMS_MAC, 1);
- if (cmsmacobj == NULL) {
- GOSTerr(GOST_F_GOST_GRASSHOPPER_CIPHER_CTL, ERR_R_MALLOC_FAILURE);
- return -1;
- }
- if (arg == 0) /*Decrypting*/ {
- STACK_OF(X509_ATTRIBUTE) *x = ptr;
- ASN1_OCTET_STRING *osExpectedMac = X509at_get0_data_by_OBJ(x,
- cmsmacobj, -3, V_ASN1_OCTET_STRING);
- ASN1_OBJECT_free(cmsmacobj);
-
- if (ptr == NULL || osExpectedMac ==NULL || osExpectedMac->length != KUZNYECHIK_MAC_MAX_SIZE)
- return -1;
-
- memcpy(c->tag, osExpectedMac->data, osExpectedMac->length);
- return 1;
- } else {
- STACK_OF(X509_ATTRIBUTE) *x = ptr;
- return (X509at_add1_attr_by_OBJ(&x, cmsmacobj,
- V_ASN1_OCTET_STRING, c->tag, KUZNYECHIK_MAC_MAX_SIZE) == NULL) ? -1 : 1;
- }
- }
- return 1;
+ {
+ STACK_OF(X509_ATTRIBUTE) *x = ptr;
+ gost_grasshopper_cipher_ctx_ctr *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
+
+ if (c->c.type != GRASSHOPPER_CIPHER_CTRACPKMOMAC)
+ return -1;
+
+ return gost2015_process_unprotected_attributes(x, arg, KUZNYECHIK_MAC_MAX_SIZE, c->tag);
+ }
+ return 1;
case EVP_CTRL_COPY: {
EVP_CIPHER_CTX *out = ptr;
return 1;
}
-GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_create(int
- cipher_type, int
- block_size)
-{
- return EVP_CIPHER_meth_new(cipher_type, block_size /* block_size */ ,
- GRASSHOPPER_KEY_SIZE /* key_size */ );
-}
-
-const int cipher_gost_grasshopper_setup(EVP_CIPHER *cipher, uint8_t mode,
- int iv_size, bool padding, int extra_flags)
-{
- unsigned long flags = (unsigned long)(mode
- | ((!padding) ? EVP_CIPH_NO_PADDING : 0)
- | ((iv_size > 0) ? EVP_CIPH_CUSTOM_IV : 0)
- | EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT
- | extra_flags);
-
- return EVP_CIPHER_meth_set_iv_length(cipher, iv_size)
- && EVP_CIPHER_meth_set_flags(cipher, flags)
- && EVP_CIPHER_meth_set_cleanup(cipher, gost_grasshopper_cipher_cleanup)
- && EVP_CIPHER_meth_set_set_asn1_params(cipher,
- gost_grasshopper_set_asn1_parameters)
- && EVP_CIPHER_meth_set_get_asn1_params(cipher,
- gost_grasshopper_get_asn1_parameters)
- && EVP_CIPHER_meth_set_ctrl(cipher, gost_grasshopper_cipher_ctl)
- && EVP_CIPHER_meth_set_do_cipher(cipher, gost_grasshopper_cipher_do);
-}
-
-const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper(uint8_t mode,
- uint8_t num)
-{
- EVP_CIPHER **cipher;
- struct GRASSHOPPER_CIPHER_PARAMS *params;
-
- cipher = &gost_grasshopper_ciphers[num];
-
- if (*cipher == NULL) {
- grasshopper_init_cipher_func init_cipher;
- int nid, block_size, ctx_size, iv_size, extra_flags;
- bool padding;
-
- params = &gost_cipher_params[num];
-
- nid = params->nid;
- init_cipher = params->init_cipher;
- block_size = params->block_size;
- ctx_size = params->ctx_size;
- iv_size = params->iv_size;
- padding = params->padding;
- extra_flags = params->extra_flags;
-
- *cipher = cipher_gost_grasshopper_create(nid, block_size);
- if (*cipher == NULL) {
- return NULL;
- }
-
- if (!cipher_gost_grasshopper_setup(*cipher, mode, iv_size, padding, extra_flags)
- || !EVP_CIPHER_meth_set_init(*cipher, init_cipher)
- || !EVP_CIPHER_meth_set_impl_ctx_size(*cipher, ctx_size)) {
- EVP_CIPHER_meth_free(*cipher);
- *cipher = NULL;
- }
- }
-
- return *cipher;
-}
-
-const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ecb()
-{
- return cipher_gost_grasshopper(EVP_CIPH_ECB_MODE, GRASSHOPPER_CIPHER_ECB);
-}
-
-const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_cbc()
-{
- return cipher_gost_grasshopper(EVP_CIPH_CBC_MODE, GRASSHOPPER_CIPHER_CBC);
-}
-
-const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ofb()
-{
- return cipher_gost_grasshopper(EVP_CIPH_OFB_MODE, GRASSHOPPER_CIPHER_OFB);
-}
-
-const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_cfb()
-{
- return cipher_gost_grasshopper(EVP_CIPH_CFB_MODE, GRASSHOPPER_CIPHER_CFB);
-}
-
-const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ctr()
-{
- return cipher_gost_grasshopper(EVP_CIPH_CTR_MODE, GRASSHOPPER_CIPHER_CTR);
-}
-
+/* Called directly by CMAC_ACPKM_Init() */
const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ctracpkm()
{
- return cipher_gost_grasshopper(EVP_CIPH_CTR_MODE,
- GRASSHOPPER_CIPHER_CTRACPKM);
-}
-
-const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper_ctracpkm_omac()
-{
- return cipher_gost_grasshopper(EVP_CIPH_CTR_MODE,
- GRASSHOPPER_CIPHER_CTRACPKMOMAC);
-}
-
-void cipher_gost_grasshopper_destroy(void)
-{
- EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_ECB]);
- gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_ECB] = NULL;
- EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CBC]);
- gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CBC] = NULL;
- EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_OFB]);
- gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_OFB] = NULL;
- EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CFB]);
- gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CFB] = NULL;
- EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTR]);
- gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTR] = NULL;
- EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTRACPKM]);
- gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTRACPKM] = NULL;
- EVP_CIPHER_meth_free(gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTRACPKMOMAC]);
- gost_grasshopper_ciphers[GRASSHOPPER_CIPHER_CTRACPKMOMAC] = NULL;
+ return GOST_init_cipher(&grasshopper_ctr_acpkm_cipher);
}
+/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */
projects / openssl-gost / engine.git / blobdiff