X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_lcl.h;h=6ca32972ffe4a0db3e4468abf86a08cff0a402e3;hb=30860f940321eb4762d6449ffef48fc93ad2d2e8;hp=9740994a41c45d2c30e9852a32661437df090e60;hpb=3b31dea89630ecd3f741171ed3e1d4259adabf0e;p=openssl-gost%2Fengine.git diff --git a/gost_lcl.h b/gost_lcl.h index 9740994..6ca3297 100644 --- a/gost_lcl.h +++ b/gost_lcl.h @@ -3,9 +3,10 @@ /********************************************************************** * gost_lcl.h * * Copyright (c) 2006 Cryptocom LTD * + * Copyright (c) 2020 Vitaly Chikunov * * This file is distributed under the same license as OpenSSL * * * - * Internal declarations used in GOST engine * + * Internal declarations used in GOST engine * * OpenSSL 0.9.9 libraries required to compile and use * * this code * **********************************************************************/ @@ -68,8 +69,8 @@ struct gost_pmeth_data { int sign_param_nid; /* Should be set whenever parameters are * filled */ EVP_MD *md; - unsigned char *shared_ukm; - size_t shared_ukm_size; /* XXX temporary use shared_ukm and hash for 2018 CKE */ + unsigned char shared_ukm[32]; + size_t shared_ukm_size; int peer_key_used; int cipher_nid; /* KExp15/KImp15 algs */ }; @@ -167,6 +168,12 @@ typedef struct { DECLARE_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS) +typedef struct { + ASN1_OCTET_STRING *ukm; + } GOST2015_CIPHER_PARAMS; + +DECLARE_ASN1_FUNCTIONS(GOST2015_CIPHER_PARAMS) + typedef struct { ASN1_OCTET_STRING *masked_priv_key; ASN1_OCTET_STRING *public_key; @@ -187,31 +194,15 @@ struct ossl_gost_digest_ctx { gost_hash_ctx dctx; gost_ctx cctx; }; -/* EVP_MD structure for GOST R 34.11 */ -EVP_MD *digest_gost(void); -void digest_gost_destroy(void); -/* EVP MD structure for GOST R 34.11-2012 algorithms */ -EVP_MD *digest_gost2012_256(void); -EVP_MD *digest_gost2012_512(void); -void digest_gost2012_256_destroy(void); -void digest_gost2012_512_destroy(void); -/* EVP_MD structure for GOST 28147 in MAC mode */ -EVP_MD *imit_gost_cpa(void); -void imit_gost_cpa_destroy(void); -EVP_MD *imit_gost_cp_12(void); -void imit_gost_cp_12_destroy(void); -EVP_MD *magma_omac(void); -void magma_omac_destroy(void); -EVP_MD *grasshopper_omac(void); -EVP_MD *grasshopper_omac_acpkm(void); -void grasshopper_omac_destroy(void); -void grasshopper_omac_acpkm_destroy(void); /* Cipher context used for EVP_CIPHER operation */ struct ossl_gost_cipher_ctx { int paramNID; unsigned int count; int key_meshing; + unsigned char kdf_seed[8]; + unsigned char tag[8]; gost_ctx cctx; + EVP_MD_CTX *omac_ctx; }; /* Structure to map parameter NID to S-block */ struct gost_cipher_info { @@ -230,21 +221,8 @@ struct ossl_gost_imit_ctx { int key_set; int dgst_size; }; -/* Table which maps parameter NID to S-blocks */ -extern struct gost_cipher_info gost_cipher_list[]; /* Find encryption params from ASN1_OBJECT */ const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj); -/* Implementation of GOST 28147-89 cipher in CFB and CNT modes */ -const EVP_CIPHER *cipher_gost(); -const EVP_CIPHER *cipher_gost_cbc(); -const EVP_CIPHER *cipher_gost_cpacnt(); -const EVP_CIPHER *cipher_gost_cpcnt_12(); -const EVP_CIPHER *cipher_magma_cbc(); -const EVP_CIPHER *cipher_magma_ctr(); -const EVP_CIPHER *cipher_magma_wrap(); -const EVP_CIPHER *cipher_kuznyechik_wrap(); -void cipher_gost_destroy(); -void wrap_ciphers_destroy(); void inc_counter(unsigned char *counter, size_t counter_bytes); @@ -308,4 +286,78 @@ int pack_sign_cp(ECDSA_SIG *s, int order, unsigned char *sig, size_t *siglen); /* Get private key as BIGNUM from both 34.10-2001 keys*/ /* Returns pointer into EVP_PKEY structure */ BIGNUM *gost_get0_priv_key(const EVP_PKEY *pkey); + +/* Struct describing cipher and used for init/deinit.*/ +struct gost_cipher_st { + struct gost_cipher_st *template; /* template struct */ + int nid; + EVP_CIPHER *cipher; + int block_size; /* (bytes) */ + int key_len; /* (bytes) */ + int iv_len; + int flags; + int (*init) (EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc); + int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl); + int (*cleanup)(EVP_CIPHER_CTX *); + int ctx_size; + int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); + int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); + int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr); +}; +typedef struct gost_cipher_st GOST_cipher; + +EVP_CIPHER *GOST_init_cipher(GOST_cipher *c); +void GOST_deinit_cipher(GOST_cipher *c); + +extern GOST_cipher Gost28147_89_cipher; +extern GOST_cipher Gost28147_89_cbc_cipher; +extern GOST_cipher Gost28147_89_cnt_cipher; +extern GOST_cipher Gost28147_89_cnt_12_cipher; +extern GOST_cipher magma_ctr_cipher; +extern GOST_cipher magma_ctr_acpkm_cipher; +extern GOST_cipher magma_ctr_acpkm_omac_cipher; +extern GOST_cipher magma_cbc_cipher; +extern GOST_cipher grasshopper_ecb_cipher; +extern GOST_cipher grasshopper_cbc_cipher; +extern GOST_cipher grasshopper_cfb_cipher; +extern GOST_cipher grasshopper_ofb_cipher; +extern GOST_cipher grasshopper_ctr_cipher; +extern GOST_cipher grasshopper_ctr_acpkm_cipher; +extern GOST_cipher grasshopper_ctr_acpkm_omac_cipher; +extern GOST_cipher magma_kexp15_cipher; +extern GOST_cipher kuznyechik_kexp15_cipher; + +struct gost_digest_st { + struct gost_digest_st *template; + int nid; + const char *alias; + EVP_MD *digest; + int result_size; + int input_blocksize; + int app_datasize; + int flags; + int (*init)(EVP_MD_CTX *ctx); + int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count); + int (*final)(EVP_MD_CTX *ctx, unsigned char *md); + int (*copy)(EVP_MD_CTX *to, const EVP_MD_CTX *from); + int (*cleanup)(EVP_MD_CTX *ctx); + int (*ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2); +}; +typedef struct gost_digest_st GOST_digest; + +EVP_MD *GOST_init_digest(GOST_digest *d); +void GOST_deinit_digest(GOST_digest *d); + +extern GOST_digest GostR3411_94_digest; +extern GOST_digest Gost28147_89_MAC_digest; +extern GOST_digest Gost28147_89_mac_12_digest; +extern GOST_digest GostR3411_2012_256_digest; +extern GOST_digest GostR3411_2012_512_digest; +extern GOST_digest magma_mac_digest; +extern GOST_digest grasshopper_mac_digest; +extern GOST_digest kuznyechik_ctracpkm_omac_digest; + #endif +/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */