Merge branch 'no_gost94_sig' into gost12_algs

Conflicts:
	Makefile
	e_gost_err.c
	e_gost_err.h
	gost2001.c
	gost94_keyx.c
	gost_ameth.c
	gost_asn1.c
	gost_eng.c
	gost_lcl.h
	gost_params.c
	gost_params.h
	gost_pmeth.c
	gost_sign.c

1 files changed, 15 insertions, 19 deletions

diff --git a/gost_lcl.h b/gost_lcl.h
index 61c2aa6..4e1c4ea 100644
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -25,6 +25,20 @@
 # define GOST_CTRL_CRYPT_PARAMS (ENGINE_CMD_BASE+GOST_PARAM_CRYPT_PARAMS)
 # define GOST_CTRL_PBE_PARAMS   (ENGINE_CMD_BASE+GOST_PARAM_PBE_PARAMS)
 
+typedef struct R3410_ec {
+    int nid;
+    char *a;
+    char *b;
+    char *p;
+    char *q;
+    char *x;
+    char *y;
+} R3410_ec_params;
+
+extern R3410_ec_params R3410_2001_paramset[],
+                      *R3410_2012_256_paramset,
+                       R3410_2012_512_paramset[];
+
 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);
@@ -182,14 +196,6 @@ extern EVP_CIPHER cipher_gost_cpcnt_12;
 # define EVP_MD_CTRL_KEY_LEN (EVP_MD_CTRL_ALG_CTRL+3)
 # define EVP_MD_CTRL_SET_KEY (EVP_MD_CTRL_ALG_CTRL+4)
 /* EVP_PKEY_METHOD key encryption callbacks */
-/* From gost94_keyx.c */
-int pkey_GOST94cp_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
-                          size_t *outlen, const unsigned char *key,
-                          size_t key_len);
-
-int pkey_GOST94cp_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
-                          size_t *outlen, const unsigned char *in,
-                          size_t in_len);
 /* From gost_ec_keyx.c */
 int pkey_GOST_ECcp_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
                            size_t *outlen, const unsigned char *key,
@@ -202,15 +208,10 @@ int pkey_GOST_ECcp_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
 /* From gost_ec_keyx.c */
 int pkey_gost_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
                         size_t *keylen);
-/* From gost94_keyx.c */
-int pkey_gost94_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-/* Internal functions for signature algorithms */
-int fill_GOST94_params(DSA *dsa, int nid);
 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_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
 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,
@@ -218,7 +219,6 @@ int gost_do_verify(const unsigned char *dgst, int dgst_len,
 int gost_ec_verify(const unsigned char *dgst, int dgst_len,
                    DSA_SIG *sig, EC_KEY *ec);
 int gost_ec_compute_public(EC_KEY *ec);
-int gost94_compute_public(DSA *dsa);
 /*============== miscellaneous functions============================= */
 /* from gost_sign.c */
 /* Convert GOST R 34.11 hash sum to bignum according to standard */
@@ -232,13 +232,9 @@ int store_bignum(BIGNUM *bn, unsigned char *buf, int len);
 BIGNUM *getbnfrombuf(const unsigned char *buf, size_t 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);
-/* Unpack GOST R 34.10 signature according to CryptoPro rules */
-DSA_SIG *unpack_cp_signature(const unsigned char *sig, size_t siglen);
 /* from ameth.c */
-/* Get private key as BIGNUM from both R 34.10-94 and R 34.10-2001  keys*/
+/* 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);
-/* Find NID by GOST 94 parameters */
-int gost94_nid_by_params(DSA *p);
 
 #endif