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

Various header consistency fixes.

parent 5043fc9f

crypto/crypto.h

+4 −0
Original line number Diff line number Diff line
@@ -318,6 +318,10 @@ int CRYPTO_add_lock(); 


void CRYPTO_set_mem_functions();

void CRYPTO_get_mem_functions();

void CRYPTO_set_locked_mem_functions();

void CRYPTO_get_locked_mem_functions();

void *CRYPTO_malloc_locked();

void CRYPTO_free_locked();

void *CRYPTO_malloc();

void *CRYPTO_realloc();

void CRYPTO_free();

crypto/des/des.h

+3 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify); 


/* Extra functions from Mark Murray <mark@grondar.za> */

void des_cblock_print_file(const des_cblock cb, FILE *fp);



#ifdef FreeBSD

/* The following functions are not in the normal unix build or the

 * SSLeay build.  When using the SSLeay build, use RAND_seed()

 * and RAND_bytes() instead. */
@@ -234,6 +236,7 @@ void des_init_random_number_generator(des_cblock *key); 
void des_set_random_generator_seed(des_cblock *key);

void des_set_sequence_number(des_cblock new_sequence_number);

void des_generate_random_block(des_cblock *block);

#endif



#else

crypto/err/err.h

+2 −0
Original line number Diff line number Diff line
@@ -263,8 +263,10 @@ void ERR_set_error_data(); 


unsigned long ERR_get_error();

unsigned long ERR_get_error_line();

unsigned long ERR_get_error_line_data();

unsigned long ERR_peek_error();

unsigned long ERR_peek_error_line();

unsigned long ERR_peek_error_line_data();

void ERR_clear_error();

char *ERR_error_string();

char *ERR_lib_error_string();

crypto/pem/pem.h

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ void PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt); 
int	PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,

		unsigned int *siglen, EVP_PKEY *pkey);



void	ERR_load_PEM_strings(void);



void	PEM_proc_type(char *buf, int type);

void	PEM_dek_info(char *buf, const char *type, int len, char *str);

crypto/pkcs12/pkcs12.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ ASN1_STRING *PKCS12_i2d_encrypt(); 
PKCS12 *PKCS12_init();

int PKCS12_key_gen_asc();

int PKCS12_key_gen_uni();

int PKCS12_PBE_keyivgen();

int PKCS12_gen_mac();

int PKCS12_verify_mac();

int PKCS12_set_mac();