Commit 777c47ac authored by Ben Laurie's avatar Ben Laurie
Browse files

Make things static that should be. Declare stuff in headers that should be. 

Fix warnings.
parent 5776c3c4

crypto/dsa/dsa_ameth.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static void update_buflen(const BIGNUM *b, size_t *pbuflen) 
			*pbuflen = i;

	}



int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)

static int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)

	{

	unsigned char *m=NULL;

	int ret=0;

crypto/engine/engine.h

+4 −0
Original line number Diff line number Diff line
@@ -391,6 +391,10 @@ int ENGINE_register_pkey_meths(ENGINE *e); 
void ENGINE_unregister_pkey_meths(ENGINE *e);

void ENGINE_register_all_pkey_meths(void);



int ENGINE_register_pkey_asn1_meths(ENGINE *e);

void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);

void ENGINE_register_all_pkey_asn1_meths(void);



/* These functions register all support from the above categories. Note, use of

 * these functions can result in static linkage of code your application may not

 * need. If you only need a subset of functionality, consider using more

crypto/engine/tb_asnmth.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int ENGINE_register_pkey_asn1_meths(ENGINE *e) 
	return 1;

	}



void ENGINE_register_all_pkey_asn1_meths()

void ENGINE_register_all_pkey_asn1_meths(void)

	{

	ENGINE *e;

crypto/evp/evp.h

+4 −0
Original line number Diff line number Diff line
@@ -876,6 +876,10 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,

			   const unsigned char *salt, int saltlen, int iter,

			   int keylen, unsigned char *out);

int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,

			   const unsigned char *salt, int saltlen, int iter,

			   const EVP_MD *digest,

		      int keylen, unsigned char *out);

int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,

			 ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md,

			 int en_de);

crypto/evp/m_sigver.c

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

#include <openssl/x509.h>



int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,

			const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey, int ver)

static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,

			  const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey,

			  int ver)

	{

	if (!EVP_DigestInit_ex(ctx, type, e))

		return 0;