Add missing prototype. Fix various warnings (C++ comments, ; outside function).

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index eda9752f54cc419c7337a466c05a2ecbd29be4f0..bf35eab1710d033ba650cd4c0bd3fa64c2681959 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -336,6 +336,7 @@ void ENGINE_load_ubsec(void);
 #endif
 void ENGINE_load_cryptodev(void);
 void ENGINE_load_padlock(void);
+void ENGINE_load_gost(void);
 void ENGINE_load_builtin_engines(void);
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation

diff --git a/engines/ccgost/gost_asn1.c b/engines/ccgost/gost_asn1.c
index d9a274d20ddfde4c77029b2d9102f956194fe242..76c18c1c66e788339124bb7944b58338f0781591 100644 (file)
--- a/engines/ccgost/gost_asn1.c
+++ b/engines/ccgost/gost_asn1.c
@@ -37,19 +37,19 @@ ASN1_NDEF_SEQUENCE(GOST_KEY_PARAMS) = {
        ASN1_SIMPLE(GOST_KEY_PARAMS, key_params, ASN1_OBJECT),
        ASN1_SIMPLE(GOST_KEY_PARAMS, hash_params, ASN1_OBJECT),
        ASN1_OPT(GOST_KEY_PARAMS, cipher_params, ASN1_OBJECT),
-} ASN1_NDEF_SEQUENCE_END(GOST_KEY_PARAMS);
+} ASN1_NDEF_SEQUENCE_END(GOST_KEY_PARAMS)
 
 IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_PARAMS)
 
 ASN1_NDEF_SEQUENCE(GOST_CIPHER_PARAMS) = {
        ASN1_SIMPLE(GOST_CIPHER_PARAMS, iv, ASN1_OCTET_STRING),
        ASN1_SIMPLE(GOST_CIPHER_PARAMS, enc_param_set, ASN1_OBJECT),
-} ASN1_NDEF_SEQUENCE_END(GOST_CIPHER_PARAMS);
+} ASN1_NDEF_SEQUENCE_END(GOST_CIPHER_PARAMS)
 
-IMPLEMENT_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS);
+IMPLEMENT_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS)
 
-ASN1_NDEF_SEQUENCE(GOST_CLIENT_KEY_EXCHANGE_PARAMS) = { //FIXME incomplete
+ASN1_NDEF_SEQUENCE(GOST_CLIENT_KEY_EXCHANGE_PARAMS) = { /*FIXME incomplete*/
        ASN1_SIMPLE(GOST_CLIENT_KEY_EXCHANGE_PARAMS, gkt, GOST_KEY_TRANSPORT)
-} ASN1_NDEF_SEQUENCE_END(GOST_CLIENT_KEY_EXCHANGE_PARAMS);
+} ASN1_NDEF_SEQUENCE_END(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 
-IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS);
+IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS)

diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index 5ea02d10634205cc8d3cc2c72d6958d3db18eca7..4d0442ed2b2e01ca4656800088d79d413842b891 100644 (file)
--- a/engines/ccgost/gost_crypt.c
+++ b/engines/ccgost/gost_crypt.c
@@ -23,9 +23,11 @@ static int   gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 /* Handles block of data in CFB mode */                        
 static int     gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
        const unsigned char *in, unsigned int inl);
+#if 0
 /* Handles block of data in CNT mode */                        
 static int     gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out,
        const unsigned char *in, unsigned int inl);
+#endif
 /* Cleanup function */                 
 static int gost_cipher_cleanup(EVP_CIPHER_CTX *);
 /* set/get cipher parameters */

diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c
index feb2a1f61551e097cb71fc9ef25165af126145c1..86602b65a33e365582f384b42c2489897b549296 100644 (file)
--- a/engines/ccgost/gost_eng.c
+++ b/engines/ccgost/gost_eng.c
@@ -145,16 +145,16 @@ static int bind_gost (ENGINE *e,const char *id)
 extern __declspec( dllexport ) 
 #endif
        
-//#ifndef OPENSSL_NO_DYNAMIC_ENGINE
-IMPLEMENT_DYNAMIC_BIND_FN(bind_gost);
+/*#ifndef OPENSSL_NO_DYNAMIC_ENGINE*/
+IMPLEMENT_DYNAMIC_BIND_FN(bind_gost)
 
 #ifdef _WIN32
 extern __declspec( dllexport ) 
 #endif
 
-IMPLEMENT_DYNAMIC_CHECK_FN();
-//#else
-//#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
+IMPLEMENT_DYNAMIC_CHECK_FN()
+/*#else*/
+/*#endif OPENSSL_NO_DYNAMIC_ENGINE */
 
 static int gost_digests(ENGINE *e, const EVP_MD **digest,
        const int **nids, int nid)
@@ -165,7 +165,7 @@ static int gost_digests(ENGINE *e, const EVP_MD **digest,
                *nids = gost_digest_nids;
                return 1; 
                }
-       //printf("Digest no %d requested\n",nid);
+       /*printf("Digest no %d requested\n",nid);*/
        if(nid == NID_id_GostR3411_94) 
                {
                *digest = &digest_gost;

diff --git a/engines/ccgost/gost_lcl.h b/engines/ccgost/gost_lcl.h
index dece3b5145e07489e5ec8856da162c2ea75d1659..4f2b6fa41e44493e40533e3950f48bd59a97d46b 100644 (file)
--- a/engines/ccgost/gost_lcl.h
+++ b/engines/ccgost/gost_lcl.h
@@ -68,7 +68,7 @@ typedef struct {
 
 DECLARE_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT)
 
-typedef struct { //FIXME incomplete
+typedef struct { /* FIXME incomplete */
        GOST_KEY_TRANSPORT *gkt;
 } GOST_CLIENT_KEY_EXCHANGE_PARAMS;
 

diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c
index d8f23e063982e544451f61b85c094c61c8a354a7..cf0435e5153ea70f0ded8a153c9f2f069aa355a9 100644 (file)
--- a/engines/ccgost/gost_pmeth.c
+++ b/engines/ccgost/gost_pmeth.c
@@ -555,14 +555,14 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth,int flags)
                                pkey_gost_encrypt_init, pkey_GOST01cp_encrypt);
                        EVP_PKEY_meth_set_decrypt(*pmeth, NULL, pkey_GOST01cp_decrypt);
                        break;
-               default: //Unsupported method
+               default: /*Unsupported method*/
                        return 0;
                }
        EVP_PKEY_meth_set_init(*pmeth, pkey_gost_init);
        EVP_PKEY_meth_set_cleanup(*pmeth, pkey_gost_cleanup);
 
        EVP_PKEY_meth_set_copy(*pmeth, pkey_gost_copy);
-       //FIXME derive etc...
+       /*FIXME derive etc...*/
        
        return 1;
        }