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

Fix warnings.

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 371d5afc1765e2b97b0aaec4dea934f1cf1adb6d..b38099175cf0eaa35f72647b8e4f5c0c3783ec2f 100644 (file)
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -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;

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index 9a2eb68646857cab39ce1c2d28b202897e295f0b..eda9752f54cc419c7337a466c05a2ecbd29be4f0 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -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

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 8aaaf004f59281ba42505842da9be5be71f350fe..b3a4fd533cc0245f92bc76466ea51e2e3a50ab9b 100644 (file)
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -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;
 

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 585cb17d1db14a05e35f781788203277d0acb144..f89dedac9effbd3e5d4e263ea32de9dec5767be0 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -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);

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 95382118b2d69fde4481e2d06de1b1bd75bff170..fd4fe349c520a1c6e55808d0fe2f02867e150497 100644 (file)
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -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;

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 5270f9925bab8865e2869664ddbcc06042b765d0..7d8cdc97c31c7a1071f21041f929655adc9440a3 100644 (file)
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -1027,6 +1027,9 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
 int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
 void OBJ_sigid_free(void);
 
+extern int obj_cleanup_defer;
+void check_defer(int nid);
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.

diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 095661805e0d98e47b04cf43522ca3efaadf1744..6577e368a86ce2583e2c87c40aa780624e652b68 100644 (file)
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -197,8 +197,8 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
        }
 
 
-int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
-                       PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey)
+static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
+                              PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey)
        {
        EVP_PKEY_CTX *pctx = NULL;
        unsigned char *ek = NULL;

diff --git a/crypto/rsa/rsa_locl.h b/crypto/rsa/rsa_locl.h
new file mode 100644 (file)
index 0000000..48ebfa3
--- /dev/null
+++ b/crypto/rsa/rsa_locl.h
@@ -0,0 +1,4 @@
+extern int int_rsa_verify(int dtype, const unsigned char *m, size_t m_len,
+               unsigned char *rm, size_t *prm_len,
+               const unsigned char *sigbuf, size_t siglen,
+               RSA *rsa);

diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 5887c4f233bd44f488f98e09d84233a8b5864c7b..98a8ce44c3ea5c0e58704b91ffcddeebfc73fd5a 100644 (file)
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -63,11 +63,7 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 #include "evp_locl.h"
-
-extern int int_rsa_verify(int dtype, const unsigned char *m, size_t m_len,
-               unsigned char *rm, size_t *prm_len,
-               const unsigned char *sigbuf, size_t siglen,
-               RSA *rsa);
+#include "rsa_locl.h"
 
 /* RSA pkey context structure */
 

diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index 7dae5c84157e12ab0633cad8021923187b2a1f96..e5a015d1a66efea4c19a064b6198b9927e7e2200 100644 (file)
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -62,6 +62,7 @@
 #include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include "rsa_locl.h"
 
 /* Size of an SSL signature: MD5+SHA1 */
 #define SSL_SIG_LENGTH 36
@@ -142,10 +143,11 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
        return(ret);
        }
 
-int int_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len,
-               unsigned char *rm, unsigned int *prm_len,
-               const unsigned char *sigbuf, unsigned int siglen,
-               RSA *rsa)
+int int_rsa_verify(int dtype, const unsigned char *m,
+                         unsigned int m_len,
+                         unsigned char *rm, unsigned int *prm_len,
+                         const unsigned char *sigbuf, unsigned int siglen,
+                         RSA *rsa)
        {
        int i,ret=0,sigtype;
        unsigned char *s;

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 47393c059133be00116b98c7d117550f329a908e..c85ea030fe820dc41fc39083d89f337c626180cb 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -803,7 +803,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
        unsigned long algorithms, mask, algo_strength, mask_strength;
        const char *l, *start, *buf;
        int j, multi, found, rule, retval, ok, buflen;
-       unsigned long cipher_id;
+       unsigned long cipher_id = 0;
        char ch;
 
        retval = 1;