Fix a variety of warnings generated by some elevated compiler-fascism,
authorGeoff Thorpe <geoff@openssl.org>
Sun, 16 Mar 2008 21:05:46 +0000 (21:05 +0000)
committerGeoff Thorpe <geoff@openssl.org>
Sun, 16 Mar 2008 21:05:46 +0000 (21:05 +0000)
OPENSSL_NO_DEPRECATED, etc. Steve, please double-check the CMS stuff...

33 files changed:
apps/ocsp.c
apps/s_client.c
apps/ts.c
crypto/asn1/a_object.c
crypto/bio/bss_mem.c
crypto/cms/cms_asn1.c
crypto/cms/cms_dd.c
crypto/cms/cms_enc.c
crypto/cms/cms_env.c
crypto/cms/cms_lib.c
crypto/cms/cms_sd.c
crypto/dh/dh_ameth.c
crypto/dh/dh_pmeth.c
crypto/dsa/dsa_ameth.c
crypto/dsa/dsa_pmeth.c
crypto/ec/ec_ameth.c
crypto/ec/eck_prn.c
crypto/engine/tb_asnmth.c
crypto/engine/tb_pkmeth.c
crypto/evp/e_rc2.c
crypto/evp/pmeth_gn.c
crypto/objects/obj_dat.c
crypto/pem/pvkfmt.c
crypto/rsa/rsa_ameth.c
crypto/rsa/rsa_pmeth.c
crypto/ts/ts_conf.c
engines/ccgost/gost_ameth.c
engines/ccgost/gost_ctl.c
engines/ccgost/gost_eng.c
ssl/d1_clnt.c
ssl/d1_srvr.c
ssl/t1_lib.c
test/igetest.c

index c436c8b..eb38e4d 100644 (file)
 #include <time.h>
 #include "apps.h" /* needs to be included before the openssl headers! */
 #include <openssl/e_os2.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #if defined(NETWARE_CLIB)
 #  ifdef NETWARE_BSDSOCK
index 0c3545a..ad8760c 100644 (file)
@@ -162,6 +162,7 @@ typedef unsigned int u_int;
 #include <openssl/pem.h>
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
+#include <openssl/bn.h>
 #include "s_apps.h"
 #include "timeouts.h"
 
index f092336..edeab82 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -65,6 +65,7 @@
 #include <openssl/pem.h>
 #include <openssl/rand.h>
 #include <openssl/ts.h>
+#include <openssl/bn.h>
 
 #undef PROG
 #define PROG   ts_main
index 6e4ae3b..f1a5a1e 100644 (file)
@@ -62,6 +62,7 @@
 #include <openssl/buffer.h>
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
+#include <openssl/bn.h>
 
 int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
        {
index f7dbdf7..e18f4bc 100644 (file)
@@ -100,7 +100,7 @@ BIO *BIO_new_mem_buf(void *buf, int len)
                BIOerr(BIO_F_BIO_NEW_MEM_BUF,BIO_R_NULL_PARAMETER);
                return NULL;
        }
-       sz = (len<0) ? strlen(buf) : len;
+       sz = (len<0) ? strlen(buf) : (size_t)len;
        if(!(ret = BIO_new(BIO_s_mem())) ) return NULL;
        b = (BUF_MEM *)ret->ptr;
        b->data = buf;
index d6363de..e5af9a0 100644 (file)
@@ -306,7 +306,7 @@ static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
                                                        void *exarg)
        {
        ASN1_STREAM_ARG *sarg = exarg;
-       CMS_ContentInfo *cms;
+       CMS_ContentInfo *cms = NULL;
        if (pval)
                cms = (CMS_ContentInfo *)*pval;
        else
index a927caa..e3da755 100644 (file)
@@ -121,7 +121,7 @@ int cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify)
 
        if (verify)
                {
-               if (mdlen != dd->digest->length)
+               if (mdlen != (unsigned int)dd->digest->length)
                        {
                        CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL,
                                CMS_R_MESSAGEDIGEST_WRONG_LENGTH);
index f96c46f..fad756e 100644 (file)
@@ -151,7 +151,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
                        goto err;
                keep_key = 1;
                }
-       else if (ec->keylen != EVP_CIPHER_CTX_key_length(ctx))
+       else if (ec->keylen != (unsigned int)EVP_CIPHER_CTX_key_length(ctx))
                {
                /* If necessary set key length */
                if (EVP_CIPHER_CTX_set_key_length(ctx, ec->keylen) <= 0)
@@ -200,7 +200,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
        return NULL;
        }
 
-int cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec, 
+static int cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec, 
                                const EVP_CIPHER *cipher,
                                const unsigned char *key, size_t keylen)
        {
index 39ebe5a..796b0d3 100644 (file)
@@ -118,7 +118,7 @@ int CMS_RecipientInfo_type(CMS_RecipientInfo *ri)
 /* Add a recipient certificate. For now only handle key transport.
  * If we ever handle key agreement will need updating.
  */
-
+#if 0 /* currently unused/undeclared */
 CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
                                        X509 *recip, unsigned int flags)
        {
@@ -208,6 +208,7 @@ CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
        return NULL;
 
        }
+#endif
 
 int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
                                        EVP_PKEY **pk, X509 **recip,
index 7b118b8..a8cefd0 100644 (file)
@@ -414,7 +414,7 @@ int cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
                }
        }
 
-STACK_OF(CMS_CertificateChoices) **cms_get0_certificate_choices(CMS_ContentInfo *cms)
+static STACK_OF(CMS_CertificateChoices) **cms_get0_certificate_choices(CMS_ContentInfo *cms)
        {
        switch (OBJ_obj2nid(cms->contentType))
                {
@@ -492,7 +492,7 @@ int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert)
        return r;
        }
 
-STACK_OF(CMS_RevocationInfoChoice) **cms_get0_revocation_choices(CMS_ContentInfo *cms)
+static STACK_OF(CMS_RevocationInfoChoice) **cms_get0_revocation_choices(CMS_ContentInfo *cms)
        {
        switch (OBJ_obj2nid(cms->contentType))
                {
index dc8e896..4483593 100644 (file)
@@ -451,7 +451,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
 
        }
 
-int CMS_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
+static int cms_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
        {
        ASN1_TIME *tt;
        int r = 0;
@@ -608,7 +608,7 @@ void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk, X509 **signer,
                *psig = si->signatureAlgorithm;
        }
 
-int cms_SignerInfo_content_sign(CMS_SignerInfo *si, BIO *chain)
+static int cms_SignerInfo_content_sign(CMS_SignerInfo *si, BIO *chain)
        {
        EVP_MD_CTX mctx;
        int r = 0;
@@ -699,7 +699,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
 
        if (CMS_signed_get_attr_by_NID(si, NID_pkcs9_signingTime, -1) < 0)
                {
-               if (!CMS_add1_signingTime(si, NULL))
+               if (!cms_add1_signingTime(si, NULL))
                        goto err;
                }
 
@@ -856,7 +856,7 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
                                CMS_R_UNABLE_TO_FINALIZE_CONTEXT);
                        goto err;
                        }
-               if (mlen != os->length)
+               if (mlen != (unsigned int)os->length)
                        {
                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
                                CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH);
index 420cfcd..b56edda 100644 (file)
@@ -60,6 +60,7 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/dh.h>
+#include <openssl/bn.h>
 #include "asn1_locl.h"
 
 static void int_dh_free(EVP_PKEY *pkey)
index 5803b1d..d415575 100644 (file)
@@ -61,6 +61,8 @@
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
+#include <openssl/dh.h>
+#include <openssl/bn.h>
 #include "evp_locl.h"
 
 /* DH pkey context structure */
index a39f4ce..52290f8 100644 (file)
@@ -60,6 +60,7 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/dsa.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
index 73db6d2..3f7638c 100644 (file)
@@ -60,6 +60,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 #include "evp_locl.h"
 #include "dsa_locl.h"
 
index b10e944..c1deea8 100644 (file)
@@ -59,6 +59,7 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/ec.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
index 3a523c0..7d3e175 100644 (file)
@@ -65,6 +65,7 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/ec.h>
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_FP_API
 int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off)
index 0972813..7509033 100644 (file)
@@ -54,6 +54,7 @@
 
 #include "eng_int.h"
 #include "asn1_locl.h"
+#include <openssl/evp.h>
 
 /* If this symbol is defined then ENGINE_get_pkey_asn1_meth_engine(), the
  * function that is used by EVP to hook in pkey_asn1_meth code and cache
index 999fc0a..1cdb967 100644 (file)
@@ -53,6 +53,7 @@
  */
 
 #include "eng_int.h"
+#include <openssl/evp.h>
 
 /* If this symbol is defined then ENGINE_get_pkey_meth_engine(), the function
  * that is used by EVP to hook in pkey_meth code and cache defaults (etc), will
index 4fd8c41..f78d781 100644 (file)
@@ -223,7 +223,7 @@ static int rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
                        return 1;
                        }
                return 0;
-#if PBE_PRF_TEST
+#ifdef PBE_PRF_TEST
        case EVP_CTRL_PBE_PRF_NID:
                *(int *)ptr = NID_hmacWithMD5;
                return 1;
index 17e0d54..30f8b05 100644 (file)
@@ -61,6 +61,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 #include "evp_locl.h"
 
 int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
index 818eda5..fa4496c 100644 (file)
@@ -63,6 +63,7 @@
 #include <openssl/lhash.h>
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
+#include <openssl/bn.h>
 
 /* obj_dat.h is generated from objects.h by obj_dat.pl */
 #ifndef OPENSSL_NO_OBJECT
index 58a7f24..b694242 100644 (file)
@@ -62,6 +62,9 @@
 #include "cryptlib.h"
 #include <openssl/pem.h>
 #include <openssl/rand.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
 
 /* Utility function: read a DWORD (4 byte unsigned integer) in little endian
  * format
index e705f16..53e29c6 100644 (file)
@@ -61,6 +61,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
index 7d6fef8..9dd0d4c 100644 (file)
@@ -61,6 +61,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/evp.h>
 #include "evp_locl.h"
 #include "rsa_locl.h"
index fef8eee..fbd294b 100644 (file)
@@ -58,6 +58,8 @@
 
 #include <string.h>
 
+#include <openssl/crypto.h>
+#include "cryptlib.h"
 #include <openssl/pem.h>
 #include <openssl/engine.h>
 #include <openssl/ts.h>
index 1236d5e..0a89603 100644 (file)
@@ -7,10 +7,12 @@
  *       for OpenSSL                                                  *
  *          Requires OpenSSL 0.9.9 for compilation                    *
  **********************************************************************/
+#include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
-#include <string.h>
 #include "gost_params.h"
 #include "gost_lcl.h"
 #include "e_gost_err.h"
index 85c2a0f..d3cd171 100644 (file)
@@ -8,6 +8,8 @@
  **********************************************************************/            
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 #include <openssl/engine.h>
 #include <openssl/buffer.h>
 #include "gost_lcl.h"
index 6acc508..d2cbe3b 100644 (file)
@@ -8,6 +8,8 @@
  *          Requires OpenSSL 0.9.9 for compilation                    *
  **********************************************************************/
 #include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 #include <openssl/obj_mac.h>
index 1623a2a..322c017 100644 (file)
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
index 9401105..c6f98a8 100644 (file)
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/md5.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
index 615a1c4..170b45d 100644 (file)
@@ -196,7 +196,9 @@ static int nid_list[] =
 int tls1_ec_curve_id2nid(int curve_id)
        {
        /* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */
-       if ((curve_id < 1) || (curve_id > sizeof(nid_list)/sizeof(nid_list[0]))) return 0;
+       if ((curve_id < 1) || ((unsigned int)curve_id >
+                               sizeof(nid_list)/sizeof(nid_list[0])))
+               return 0;
        return nid_list[curve_id-1];
        }
 
@@ -1058,7 +1060,8 @@ int ssl_prepare_clienthello_tlsext(SSL *s)
                        SSLerr(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT,ERR_R_MALLOC_FAILURE);
                        return -1;
                        }
-               for (i = 1, j = s->tlsext_ellipticcurvelist; i <= sizeof(nid_list)/sizeof(nid_list[0]); i++)
+               for (i = 1, j = s->tlsext_ellipticcurvelist; (unsigned int)i <=
+                               sizeof(nid_list)/sizeof(nid_list[0]); i++)
                        s2n(i,j);
                }
 #endif /* OPENSSL_NO_EC */
index 527c6c7..1ba9002 100644 (file)
@@ -190,7 +190,7 @@ static struct bi_ige_test const bi_ige_test_vectors[] = {
 
 static int run_test_vectors(void)
        {
-       int n;
+       unsigned int n;
        int errs = 0;
 
        for(n=0 ; n < sizeof(ige_test_vectors)/sizeof(ige_test_vectors[0]) ; ++n)
@@ -292,7 +292,7 @@ int main(int argc, char **argv)
        unsigned char iv[AES_BLOCK_SIZE*4];
        unsigned char saved_iv[AES_BLOCK_SIZE*4];
        int err = 0;
-       int n;
+       unsigned int n;
        unsigned matches;
 
        assert(BIG_TEST_SIZE >= TEST_SIZE);