diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-03-16 20:59:10 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-03-16 20:59:10 +0000 |
| commit | 7c337e00d23ac421ff1949ac1bbce2e8b718299e (patch) | |
| tree | 3a7976f3d6a98d1273170ec17feda7db109a40a6 | |
| parent | 7e8481afd12c596b5c905596d6facae60834854a (diff) | |
Fix some warnings.
| -rw-r--r-- | apps/ca.c | 4 | ||||
| -rw-r--r-- | apps/cms.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/a_type.c | 3 | ||||
| -rw-r--r-- | crypto/cms/cms_asn1.c | 2 | ||||
| -rw-r--r-- | crypto/hmac/hm_pmeth.c | 3 |
5 files changed, 9 insertions, 5 deletions
@@ -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; diff --git a/apps/cms.c b/apps/cms.c index b757908070..eb54a0d623 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -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; diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index 90f14241e7..a45d2f9d12 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -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) { diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c index b9521c9a5a..d6363deb37 100644 --- a/crypto/cms/cms_asn1.c +++ b/crypto/cms/cms_asn1.c @@ -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) { diff --git a/crypto/hmac/hm_pmeth.c b/crypto/hmac/hm_pmeth.c index 6355a44413..b5e455733b 100644 --- a/crypto/hmac/hm_pmeth.c +++ b/crypto/hmac/hm_pmeth.c @@ -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")) { |