Fix some warnings.
authorDr. Stephen Henson <steve@openssl.org>
Sun, 16 Mar 2008 20:59:10 +0000 (20:59 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 16 Mar 2008 20:59:10 +0000 (20:59 +0000)
apps/ca.c
apps/cms.c
crypto/asn1/a_type.c
crypto/cms/cms_asn1.c
crypto/hmac/hm_pmeth.c

index 291f164..b6d871d 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -226,7 +226,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
 static int do_revoke(X509 *x509, CA_DB *db, int ext, char *extval);
 static int get_certificate_status(const char *ser_status, CA_DB *db);
 static int do_updatedb(CA_DB *db);
-static int check_time_format(char *str);
+static int check_time_format(const char *str);
 char *make_revocation_str(int rev_type, char *rev_arg);
 int make_revoked(X509_REVOKED *rev, const char *str);
 int old_entry_print(BIO *bp, ASN1_OBJECT *obj, ASN1_STRING *str);
@@ -2384,7 +2384,7 @@ static int fix_data(int nid, int *type)
        return(1);
        }
 
-static int check_time_format(char *str)
+static int check_time_format(const char *str)
        {
        ASN1_UTCTIME tm;
 
index b757908..eb54a0d 100644 (file)
@@ -124,7 +124,7 @@ int MAIN(int argc, char **argv)
        char *engine=NULL;
 #endif
        unsigned char *secret_key = NULL;
-       size_t secret_keylen;
+       size_t secret_keylen = 0;
 
        X509_VERIFY_PARAM *vpm = NULL;
 
index 90f1424..a45d2f9 100644 (file)
@@ -87,7 +87,8 @@ int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value)
        {
        if (!value || (type == V_ASN1_BOOLEAN))
                {
-               ASN1_TYPE_set(a, type, (void *)value);
+               void *p = (void *)value;
+               ASN1_TYPE_set(a, type, p);
                }
        else if (type == V_ASN1_OBJECT)
                {
index b9521c9..d6363de 100644 (file)
@@ -309,6 +309,8 @@ static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
        CMS_ContentInfo *cms;
        if (pval)
                cms = (CMS_ContentInfo *)*pval;
+       else
+               return 1;
        switch(operation)
                {
 
index 6355a44..b5e4557 100644 (file)
@@ -206,8 +206,9 @@ static int pkey_hmac_ctrl_str(EVP_PKEY_CTX *ctx,
                }
        if (!strcmp(type, "key"))
                {
+               void *p = (void *)value;
                return pkey_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
-                               -1, (void *)value);
+                               -1, p);
                }
        if (!strcmp(type, "hexkey"))
                {