Commit 0ae645db authored by Ulf Möller's avatar Ulf Möller
Browse files

Clean up prototypes (prepare for removing NOPROTO).

parent 434c5dd3

crypto/bio/bio.h

+3 −2
Original line number Diff line number Diff line
@@ -446,10 +446,11 @@ int BIO_read_filename(BIO *b,const char *name); 


#ifndef NOPROTO



int BIO_get_ex_num(BIO *bio);

/* These two aren't currently implemented */

/* int BIO_get_ex_num(BIO *bio); */

/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */

int BIO_set_ex_data(BIO *bio,int idx,char *data);

char *BIO_get_ex_data(BIO *bio,int idx);

void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)());

int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),

	int (*dup_func)(), void (*free_func)());

crypto/evp/evp.h

+8 −8
Original line number Diff line number Diff line
@@ -190,28 +190,28 @@ typedef struct evp_pkey_md_st 
	EVP_PKEY_METHOD *pkey;

	} EVP_PKEY_MD;



#define EVP_rsa_md2()

#define EVP_rsa_md2() \

		EVP_PKEY_MD_add(NID_md2WithRSAEncryption,\

			EVP_rsa_pkcs1(),EVP_md2())

#define EVP_rsa_md5()

#define EVP_rsa_md5() \

		EVP_PKEY_MD_add(NID_md5WithRSAEncryption,\

			EVP_rsa_pkcs1(),EVP_md5())

#define EVP_rsa_sha0()

#define EVP_rsa_sha0() \

		EVP_PKEY_MD_add(NID_shaWithRSAEncryption,\

			EVP_rsa_pkcs1(),EVP_sha())

#define EVP_rsa_sha1()

#define EVP_rsa_sha1() \

		EVP_PKEY_MD_add(NID_sha1WithRSAEncryption,\

			EVP_rsa_pkcs1(),EVP_sha1())

#define EVP_rsa_ripemd160()

#define EVP_rsa_ripemd160() \

		EVP_PKEY_MD_add(NID_ripemd160WithRSA,\

			EVP_rsa_pkcs1(),EVP_ripemd160())

#define EVP_rsa_mdc2()

#define EVP_rsa_mdc2() \

		EVP_PKEY_MD_add(NID_mdc2WithRSA,\

			EVP_rsa_octet_string(),EVP_mdc2())

#define EVP_dsa_sha()

#define EVP_dsa_sha() \

		EVP_PKEY_MD_add(NID_dsaWithSHA,\

			EVP_dsa(),EVP_mdc2())

#define EVP_dsa_sha1()

#define EVP_dsa_sha1() \

		EVP_PKEY_MD_add(NID_dsaWithSHA1,\

			EVP_dsa(),EVP_sha1())

crypto/pkcs12/pkcs12.h

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ int PKCS12_key_gen_asc(unsigned char *pass, int passlen, unsigned char *salt, in 
int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type);

int PKCS12_PBE_keyivgen(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_CIPHER *cipher, EVP_MD *md_type, unsigned char *key, unsigned char *iv);

int PKCS12_gen_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *mac, unsigned int *maclen);

int PKCS12_gen_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *mac, unsigned int *maclen);

int PKCS12_verify_mac(PKCS12 *p12, unsigned char *pass, int passlen);

int PKCS12_set_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_MD *md_type);

int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, EVP_MD *md_type);

crypto/x509v3/x509v3.h

+2 −2
Original line number Diff line number Diff line
@@ -423,8 +423,8 @@ PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD(); 
PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new();

void PKEY_USAGE_PERIOD_free();



STACK *GENERAL_NAMES_new():

void GENERAL_NAMES_free():

STACK *GENERAL_NAMES_new();

void GENERAL_NAMES_free();

STACK *d2i_GENERAL_NAMES();

int i2d_GENERAL_NAMES();

STACK *i2v_GENERAL_NAMES();