X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_lcl.h;h=d2d2e79273eac49e7472a821761a663169031500;hb=ea281d2516111f018f224409098d5a1d11e967bd;hp=58ac94d8921bee24b06a59d95282b31e969a32d9;hpb=14e654cab19089027b00733594480eb03d8c6da5;p=openssl-gost%2Fengine.git diff --git a/gost_lcl.h b/gost_lcl.h index 58ac94d..d2d2e79 100644 --- a/gost_lcl.h +++ b/gost_lcl.h @@ -11,7 +11,6 @@ **********************************************************************/ # include # include -# include # include # include # include @@ -22,7 +21,7 @@ # define GOST_PARAM_CRYPT_PARAMS 0 # define GOST_PARAM_PBE_PARAMS 1 # define GOST_PARAM_PK_FORMAT 2 -# define GOST_PARAM_MAX 2 +# define GOST_PARAM_MAX 3 # define GOST_CTRL_CRYPT_PARAMS (ENGINE_CMD_BASE+GOST_PARAM_CRYPT_PARAMS) # define GOST_CTRL_PBE_PARAMS (ENGINE_CMD_BASE+GOST_PARAM_PBE_PARAMS) # define GOST_CTRL_PK_FORMAT (ENGINE_CMD_BASE+GOST_PARAM_PK_FORMAT) @@ -35,6 +34,7 @@ typedef struct R3410_ec { char *q; char *x; char *y; + char *cofactor; } R3410_ec_params; extern R3410_ec_params R3410_2001_paramset[], @@ -55,6 +55,7 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth, int flags); /* Gost-specific pmeth control-function parameters */ /* For GOST R34.10 parameters */ # define param_ctrl_string "paramset" +# define ukm_ctrl_string "ukmhex" # define EVP_PKEY_CTRL_GOST_PARAMSET (EVP_PKEY_ALG_CTRL+1) /* For GOST 28147 MAC */ # define key_ctrl_string "key" @@ -67,8 +68,10 @@ struct gost_pmeth_data { int sign_param_nid; /* Should be set whenever parameters are * filled */ EVP_MD *md; - unsigned char *shared_ukm; + unsigned char shared_ukm[32]; + size_t shared_ukm_size; int peer_key_used; + int cipher_nid; /* KExp15/KImp15 algs */ }; struct gost_mac_pmeth_data { @@ -112,6 +115,25 @@ typedef struct { /* FIXME incomplete */ GOST_KEY_TRANSPORT *gkt; } GOST_CLIENT_KEY_EXCHANGE_PARAMS; +/* PSKeyTransport ::= SEQUENCE { + PSEXP OCTET STRING, + ephemeralPublicKey SubjectPublicKeyInfo + } + SubjectPublicKeyInfo ::= SEQUENCE { + algorithm AlgorithmIdentifier, + subjectPublicKey BITSTRING + } + AlgorithmIdentifier ::= SEQUENCE { + algorithm OBJECT IDENTIFIER, + parameters ANY OPTIONAL + }*/ +typedef struct PSKeyTransport_st { + ASN1_OCTET_STRING *psexp; + X509_PUBKEY *ephem_key; + ASN1_OCTET_STRING *ukm; +} PSKeyTransport_gost; + +DECLARE_ASN1_FUNCTIONS(PSKeyTransport_gost) /* * Hacks to shorten symbols to 31 characters or less, or OpenVMS. This mimics * what's done in symhacks.h, but since this is a very local header file, I @@ -145,6 +167,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; @@ -181,13 +209,18 @@ 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 { @@ -211,53 +244,143 @@ 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_ctr_acpkm(); +const EVP_CIPHER *cipher_magma_ctr_acpkm_omac(); +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); + # define EVP_MD_CTRL_KEY_LEN (EVP_MD_CTRL_ALG_CTRL+3) # define EVP_MD_CTRL_SET_KEY (EVP_MD_CTRL_ALG_CTRL+4) -# define EVP_MD_CTRL_MAC_LEN (EVP_MD_CTRL_ALG_CTRL+5) /* EVP_PKEY_METHOD key encryption callbacks */ /* From gost_ec_keyx.c */ -int pkey_GOST_ECcp_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, - size_t *outlen, const unsigned char *key, +int pkey_gost_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out, + size_t *out_len, const unsigned char *key, size_t key_len); -int pkey_GOST_ECcp_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, - size_t *outlen, const unsigned char *in, +int pkey_gost_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key, + size_t *key_len, const unsigned char *in, size_t in_len); /* derive functions */ /* From gost_ec_keyx.c */ -int pkey_gost_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, - size_t *keylen); +int pkey_gost_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen); int fill_GOST_EC_params(EC_KEY *eckey, int nid); -int gost_sign_keygen(DSA *dsa); int gost_ec_keygen(EC_KEY *ec); -DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey); - -int gost_do_verify(const unsigned char *dgst, int dgst_len, - DSA_SIG *sig, DSA *dsa); +ECDSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey); int gost_ec_verify(const unsigned char *dgst, int dgst_len, - DSA_SIG *sig, EC_KEY *ec); + ECDSA_SIG *sig, EC_KEY *ec); int gost_ec_compute_public(EC_KEY *ec); + +/* VKO */ +int VKO_compute_key(unsigned char *shared_key, + const EC_POINT *pub_key, const EC_KEY *priv_key, + const unsigned char *ukm, const size_t ukm_size, + const int vko_dgst_nid); + +/* KDF TREE */ +int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len, + const unsigned char *key, size_t keylen, + const unsigned char *label, size_t label_len, + const unsigned char *seed, size_t seed_len, + const size_t representation); + +int gost_tlstree(int cipher_nid, const unsigned char *in, unsigned char *out, + const unsigned char *tlsseq); +/* KExp/KImp */ +int gost_kexp15(const unsigned char *shared_key, const int shared_len, + int cipher_nid, const unsigned char *cipher_key, + int mac_nid, unsigned char *mac_key, + const unsigned char *iv, const size_t ivlen, + unsigned char *out, int *out_len); +int gost_kimp15(const unsigned char *expkey, const size_t expkeylen, + int cipher_nid, const unsigned char *cipher_key, + int mac_nid, unsigned char *mac_key, + const unsigned char *iv, const size_t ivlen, + unsigned char *shared_key); /*============== miscellaneous functions============================= */ -/* from gost_sign.c */ -/* Convert GOST R 34.11 hash sum to bignum according to standard */ -BIGNUM *hashsum2bn(const unsigned char *dgst, int len); /* * Store bignum in byte array of given length, prepending by zeros if * nesseccary */ int store_bignum(const BIGNUM *bn, unsigned char *buf, int len); /* Pack GOST R 34.10 signature according to CryptoPro rules */ -int pack_sign_cp(DSA_SIG *s, int order, unsigned char *sig, size_t *siglen); +int pack_sign_cp(ECDSA_SIG *s, int order, unsigned char *sig, size_t *siglen); /* from ameth.c */ /* 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; + 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; + #endif +/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */