Commit 84948b39 authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix various warnings.

parent cf32ad7f

crypto/evp/names.c

+0 −3
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ 
#include <openssl/objects.h>

#include <openssl/x509.h>



extern int obj_cleanup_defer;

extern void check_defer(int nid);



int EVP_add_cipher(const EVP_CIPHER *c)

	{

	int r;

engines/ccgost/gost2001_keyx.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "e_gost_err.h"

#include "gost_keywrap.h"

#include "gost_lcl.h"

#include "gost2001_keyx.h"



/* Transform ECDH shared key into little endian as required by Cryptocom

 * key exchange */

engines/ccgost/gost2001_keyx.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
GOST_KEY_TRANSPORT *

make_rfc4490_keytransport_2001(EVP_PKEY *pubk, BIGNUM *eph_key,

                               const unsigned char *key, size_t keylen,

                               unsigned char *ukm, size_t ukm_len);



int decrypt_rfc4490_shared_key_2001(EVP_PKEY *priv,

                                    GOST_KEY_TRANSPORT *gkt,

                                    unsigned char *key_buf,

                                    int key_buf_len) ;

engines/ccgost/gost89.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ const byte CryptoProKeyMeshingKey[]={ 
    0xC0, 0x86, 0xDC, 0xC2,   0xEF, 0x4C, 0xA9, 0x2B

	};	

/* Initialization of gost_ctx subst blocks*/

void kboxinit(gost_ctx *c, const gost_subst_block *b)

static void kboxinit(gost_ctx *c, const gost_subst_block *b)

	{ 

	int i;

engines/ccgost/gost_ameth.c

+3 −1
Original line number Diff line number Diff line
@@ -98,11 +98,13 @@ static int decode_gost_algor_params(EVP_PKEY *pkey, X509_ALGOR *palg) 
	ASN1_OBJECT *palg_obj =NULL;

	int ptype = V_ASN1_UNDEF;

	int pkey_nid = NID_undef,param_nid = NID_undef;

        void *_pval;

	ASN1_STRING *pval = NULL;

	const unsigned char  *p;

	GOST_KEY_PARAMS *gkp = NULL;



	X509_ALGOR_get0(&palg_obj, &ptype, (void **) (&pval), palg);

	X509_ALGOR_get0(&palg_obj, &ptype, &_pval, palg);

        pval = _pval;

	if (ptype != V_ASN1_SEQUENCE) 

		{

		GOSTerr(GOST_F_DECODE_GOST_ALGOR_PARAMS,