Commit 44181ea8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

parent c80c7bf9

crypto/engine/engine.h

+1 −0
Original line number Diff line number Diff line
@@ -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

engines/ccgost/gost_asn1.c

+6 −6
Original line number Diff line number Diff line
@@ -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)

engines/ccgost/gost_crypt.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */

engines/ccgost/gost_eng.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

engines/ccgost/gost_lcl.h

+1 −1
Original line number Diff line number Diff line
@@ -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;