X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_lcl.h;h=ffa8c76d1245c61e6a96f5a88f9dee4dfba6f845;hb=HEAD;hp=6ca32972ffe4a0db3e4468abf86a08cff0a402e3;hpb=410e6c831e2fc37ac9c81c5c6e2e32f564720e86;p=openssl-gost%2Fengine.git diff --git a/gost_lcl.h b/gost_lcl.h index 6ca3297..ffa8c76 100644 --- a/gost_lcl.h +++ b/gost_lcl.h @@ -10,12 +10,14 @@ * OpenSSL 0.9.9 libraries required to compile and use * * this code * **********************************************************************/ +# include # include # include # include # include # include # include +# include # include "gost89.h" # include "gosthash.h" /* Control commands */ @@ -36,11 +38,14 @@ typedef struct R3410_ec { char *x; char *y; char *cofactor; + EC_GROUP *group; } R3410_ec_params; extern R3410_ec_params R3410_2001_paramset[], *R3410_2012_256_paramset, R3410_2012_512_paramset[]; +void free_cached_groups(void); + extern const ENGINE_CMD_DEFN gost_cmds[]; int gost_control_func(ENGINE *e, int cmd, long i, void *p, void (*f) (void)); const char *get_gost_engine_param(int param); @@ -49,6 +54,10 @@ void gost_param_free(void); /* method registration */ +/* Provider implementation data */ +extern const OSSL_ALGORITHM GOST_prov_macs[]; +void GOST_prov_deinit_mac_digests(void); + int register_ameth_gost(int nid, EVP_PKEY_ASN1_METHOD **ameth, const char *pemstr, const char *info); int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth, int flags); @@ -57,6 +66,7 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth, int flags); /* For GOST R34.10 parameters */ # define param_ctrl_string "paramset" # define ukm_ctrl_string "ukmhex" +# define vko_ctrl_string "vko" # define EVP_PKEY_CTRL_GOST_PARAMSET (EVP_PKEY_ALG_CTRL+1) /* For GOST 28147 MAC */ # define key_ctrl_string "key" @@ -64,6 +74,7 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth, int flags); # define maclen_ctrl_string "size" # define EVP_PKEY_CTRL_GOST_MAC_HEXKEY (EVP_PKEY_ALG_CTRL+3) # define EVP_PKEY_CTRL_MAC_LEN (EVP_PKEY_ALG_CTRL+5) +# define EVP_PKEY_CTRL_SET_VKO (EVP_PKEY_ALG_CTRL+11) /* Pmeth internal representation */ struct gost_pmeth_data { int sign_param_nid; /* Should be set whenever parameters are @@ -73,6 +84,7 @@ struct gost_pmeth_data { size_t shared_ukm_size; int peer_key_used; int cipher_nid; /* KExp15/KImp15 algs */ + int vko_dgst_nid; }; struct gost_mac_pmeth_data { @@ -247,6 +259,22 @@ 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, ECDSA_SIG *sig, EC_KEY *ec); int gost_ec_compute_public(EC_KEY *ec); +int gost_ec_point_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, + const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx); + +#define CURVEDEF(a) \ +int point_mul_##a(const EC_GROUP *group, EC_POINT *r, const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);\ +int point_mul_g_##a(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, BN_CTX *ctx);\ +int point_mul_two_##a(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx); + +CURVEDEF(id_GostR3410_2001_CryptoPro_A_ParamSet) +CURVEDEF(id_GostR3410_2001_CryptoPro_B_ParamSet) +CURVEDEF(id_GostR3410_2001_CryptoPro_C_ParamSet) +CURVEDEF(id_GostR3410_2001_TestParamSet) +CURVEDEF(id_tc26_gost_3410_2012_256_paramSetA) +CURVEDEF(id_tc26_gost_3410_2012_512_paramSetA) +CURVEDEF(id_tc26_gost_3410_2012_512_paramSetB) +CURVEDEF(id_tc26_gost_3410_2012_512_paramSetC) /* VKO */ int VKO_compute_key(unsigned char *shared_key, @@ -286,6 +314,9 @@ 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); +/* from gost_crypt.c */ +/* Decrements 8-byte sequence */ +int decrement_sequence(unsigned char *seq, int decrement); /* Struct describing cipher and used for init/deinit.*/ struct gost_cipher_st { @@ -311,6 +342,7 @@ typedef struct gost_cipher_st GOST_cipher; EVP_CIPHER *GOST_init_cipher(GOST_cipher *c); void GOST_deinit_cipher(GOST_cipher *c); +/* ENGINE implementation data */ extern GOST_cipher Gost28147_89_cipher; extern GOST_cipher Gost28147_89_cbc_cipher; extern GOST_cipher Gost28147_89_cnt_cipher; @@ -318,17 +350,24 @@ 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_ecb_cipher; extern GOST_cipher magma_cbc_cipher; +extern GOST_cipher magma_mgm_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_mgm_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; +/* Provider implementation data */ +extern const OSSL_ALGORITHM GOST_prov_ciphers[]; +void GOST_prov_deinit_ciphers(void); + struct gost_digest_st { struct gost_digest_st *template; int nid; @@ -350,6 +389,7 @@ typedef struct gost_digest_st GOST_digest; EVP_MD *GOST_init_digest(GOST_digest *d); void GOST_deinit_digest(GOST_digest *d); +/* ENGINE implementation data */ extern GOST_digest GostR3411_94_digest; extern GOST_digest Gost28147_89_MAC_digest; extern GOST_digest Gost28147_89_mac_12_digest; @@ -359,5 +399,22 @@ extern GOST_digest magma_mac_digest; extern GOST_digest grasshopper_mac_digest; extern GOST_digest kuznyechik_ctracpkm_omac_digest; +/* Provider implementation data */ +extern const OSSL_ALGORITHM GOST_prov_digests[]; +void GOST_prov_deinit_digests(void); + +/* job to initialize a missing NID */ +struct gost_nid_job { + const char *sn; + const char *ln; + void (*callback)(int nid); + ASN1_OBJECT *asn1; +}; + +typedef struct gost_nid_job GOST_NID_JOB; + +extern GOST_NID_JOB magma_mgm_NID; +extern GOST_NID_JOB kuznyechik_mgm_NID; + #endif /* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */