Commit 40889b9c authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

Add missing prototypes. 

Submitted by: Goetz Babin-Ebell <babinebell@trustcenter.de>
PR: 89
parent 99889b46

apps/apps.c

+3 −3
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int ui_close(UI *ui) 
	{

	return UI_method_get_closer(UI_OpenSSL())(ui);

	}

int setup_ui_method()

int setup_ui_method(void)

	{

	ui_method = UI_create_method("OpenSSL application user interface");

	UI_method_set_opener(ui_method, ui_open);
@@ -499,7 +499,7 @@ int setup_ui_method() 
	UI_method_set_closer(ui_method, ui_close);

	return 0;

	}

void destroy_ui_method()

void destroy_ui_method(void)

	{

	if(ui_method)

		{
@@ -1263,7 +1263,7 @@ X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath) 
}



/* Try to load an engine in a shareable library */

ENGINE *try_load_engine(BIO *err, const char *engine, int debug)

static ENGINE *try_load_engine(BIO *err, const char *engine, int debug)

	{

	ENGINE *e = ENGINE_by_id("dynamic");

	if (e)

apps/apps.h

+2 −6
Original line number Diff line number Diff line
@@ -134,10 +134,6 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read, 
                                       * (see e_os.h).  The string is

                                       * destroyed! */



#ifdef OPENSSL_NO_STDIO

BIO_METHOD *BIO_s_file();

#endif



#ifdef OPENSSL_SYS_WIN32

#define rename(from,to) WIN32_rename((from),(to))

int WIN32_rename(char *oldname,char *newname);
@@ -217,8 +213,8 @@ typedef struct pw_cb_data 
int password_callback(char *buf, int bufsiz, int verify,

	PW_CB_DATA *cb_data);



int setup_ui_method();

void destroy_ui_method();

int setup_ui_method(void);

void destroy_ui_method(void);



int should_retry(int i);

int args_from_file(char *file, int *argc, char **argv[]);

apps/enc.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int set_hex(char *in,unsigned char *out,int size); 
#define BSIZE	(8*1024)

#define	PROG	enc_main



void show_ciphers(const OBJ_NAME *name,void *bio_)

static void show_ciphers(const OBJ_NAME *name,void *bio_)

	{

	BIO *bio=bio_;

	static int n;

crypto/asn1/a_strex.c

+6 −5
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
/* Three IO functions for sending data to memory, a BIO and

 * and a FILE pointer.

 */



int send_mem_chars(void *arg, const void *buf, int len)

#if 0				/* never used */

static int send_mem_chars(void *arg, const void *buf, int len)

{

	unsigned char **out = arg;

	if(!out) return 1;
@@ -86,15 +86,16 @@ int send_mem_chars(void *arg, const void *buf, int len) 
	*out += len;

	return 1;

}

#endif



int send_bio_chars(void *arg, const void *buf, int len)

static int send_bio_chars(void *arg, const void *buf, int len)

{

	if(!arg) return 1;

	if(BIO_write(arg, buf, len) != len) return 0;

	return 1;

}



int send_fp_chars(void *arg, const void *buf, int len)

static int send_fp_chars(void *arg, const void *buf, int len)

{

	if(!arg) return 1;

	if(fwrite(buf, 1, len, arg) != (unsigned int)len) return 0;
@@ -240,7 +241,7 @@ static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf, int buflen 
 * #01234 format.

 */



int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str)

static int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str)

{

	/* Placing the ASN1_STRING in a temp ASN1_TYPE allows

	 * the DER encoding to readily obtained

crypto/asn1/asn1_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <stdio.h>

#include "cryptlib.h"

#include <openssl/asn1.h>

#include <openssl/asn1_mac.h>



static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);

static void asn1_put_length(unsigned char **pp, int length);