generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some warnings.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2008-03-16 20:59:10 +00:00
parent 7e8481afd1
commit 7c337e00d2
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ca.c
View File

@ -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 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 get_certificate_status(const char *ser_status, CA_DB *db);
static int do_updatedb(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); char *make_revocation_str(int rev_type, char *rev_arg);
int make_revoked(X509_REVOKED *rev, const char *str); int make_revoked(X509_REVOKED *rev, const char *str);
int old_entry_print(BIO *bp, ASN1_OBJECT *obj, ASN1_STRING *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); return(1);
} }
static int check_time_format(char *str) static int check_time_format(const char *str)
{ {
ASN1_UTCTIME tm; ASN1_UTCTIME tm;

2
apps/cms.c
View File

@ -124,7 +124,7 @@ int MAIN(int argc, char **argv)
char *engine=NULL; char *engine=NULL;
#endif #endif
unsigned char *secret_key = NULL; unsigned char *secret_key = NULL;
size_t secret_keylen; size_t secret_keylen = 0;
X509_VERIFY_PARAM *vpm = NULL; X509_VERIFY_PARAM *vpm = NULL;

3
crypto/asn1/a_type.c
View File

@ -87,7 +87,8 @@ int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value)
{ {
if (!value || (type == V_ASN1_BOOLEAN)) 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) else if (type == V_ASN1_OBJECT)
{ {

2
crypto/cms/cms_asn1.c
View File

@ -309,6 +309,8 @@ static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
CMS_ContentInfo *cms; CMS_ContentInfo *cms;
if (pval) if (pval)
cms = (CMS_ContentInfo *)*pval; cms = (CMS_ContentInfo *)*pval;
else
return 1;
switch(operation) switch(operation)
{ {

3
crypto/hmac/hm_pmeth.c
View File

@ -206,8 +206,9 @@ static int pkey_hmac_ctrl_str(EVP_PKEY_CTX *ctx,
} }
if (!strcmp(type, "key")) if (!strcmp(type, "key"))
{ {
void *p = (void *)value;
return pkey_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, return pkey_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
-1, (void *)value); -1, p);
} }
if (!strcmp(type, "hexkey")) if (!strcmp(type, "hexkey"))
{ {