Clean up prototypes (prepare for removing NOPROTO).

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index f83b3e2f244b8d24a0d35d9fc524adced7d1f4a3..be1a24373039985a081de84054e508e81aef5a98 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -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)());
 

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 248ac0c1910fda67206481cb8b4fba04b5b53ae0..21417b1dfd9b0a626233be756373dcea0c5838b4 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -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())
 

diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 98a5d1cb356437e4eeca40870e5c8be4c0ef5af8..8f7a5b5ce6b81519f89934d3215ca0197916fd86 100644 (file)
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -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);

diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index b997db7aa8c0562ab90d83fc2b09779d9ed83577..8ebbea2ed0d651ff6acf55d6ba5a2c249367fb2d 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -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();