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

some const fixes and cleanup

Browse Source
This commit is contained in:
Nils Larsch 2005-04-05 10:29:43 +00:00
parent c2e40d0f9a
commit 70f34a5841
9 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/asn1/asn1_par.c
View File

@ -215,7 +215,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
{ {
if (BIO_write(bp,":",1) <= 0) goto end; if (BIO_write(bp,":",1) <= 0) goto end;
if ((len > 0) && if ((len > 0) &&
BIO_write(bp,(char *)p,(int)len) BIO_write(bp,(const char *)p,(int)len)
!= (int)len) != (int)len)
goto end; goto end;
} }
@ -278,7 +278,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
{ {
if (BIO_write(bp,":",1) <= 0) if (BIO_write(bp,":",1) <= 0)
goto end; goto end;
if (BIO_write(bp,(char *)opp, if (BIO_write(bp,(const char *)opp,
os->length) <= 0) os->length) <= 0)
goto end; goto end;
} }
@ -303,7 +303,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
if (BIO_write(bp,"\n",1) <= 0) if (BIO_write(bp,"\n",1) <= 0)
goto end; goto end;
} }
if (BIO_dump_indent(bp,(char *)opp, if (BIO_dump_indent(bp,
(const char *)opp,
((dump == -1 || dump > ((dump == -1 || dump >
os->length)?os->length:dump), os->length)?os->length:dump),
dump_indent) <= 0) dump_indent) <= 0)
@ -388,7 +389,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
if (BIO_write(bp,"\n",1) <= 0) if (BIO_write(bp,"\n",1) <= 0)
goto end; goto end;
} }
if (BIO_dump_indent(bp,(char *)p, if (BIO_dump_indent(bp,(const char *)p,
((dump == -1 || dump > len)?len:dump), ((dump == -1 || dump > len)?len:dump),
dump_indent) <= 0) dump_indent) <= 0)
goto end; goto end;

2
crypto/bio/b_print.c
View File

@ -482,7 +482,7 @@ fmtint(
int flags) int flags)
{ {
int signvalue = 0; int signvalue = 0;
char *prefix = ""; const char *prefix = "";
unsigned LLONG uvalue; unsigned LLONG uvalue;
char convert[DECIMAL_SIZE(value)+3]; char convert[DECIMAL_SIZE(value)+3];
int place = 0; int place = 0;

14
crypto/err/err.c
View File

@ -943,7 +943,7 @@ static unsigned long err_hash(const void *a_void)
{ {
unsigned long ret,l; unsigned long ret,l;
l=((ERR_STRING_DATA *)a_void)->error; l=((const ERR_STRING_DATA *)a_void)->error;
ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l); ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
return(ret^ret%19*13); return(ret^ret%19*13);
} }
@ -951,21 +951,21 @@ static unsigned long err_hash(const void *a_void)
/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */ /* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */
static int err_cmp(const void *a_void, const void *b_void) static int err_cmp(const void *a_void, const void *b_void)
{ {
return((int)(((ERR_STRING_DATA *)a_void)->error - return((int)(((const ERR_STRING_DATA *)a_void)->error -
((ERR_STRING_DATA *)b_void)->error)); ((const ERR_STRING_DATA *)b_void)->error));
} }
/* static unsigned long pid_hash(ERR_STATE *a) */ /* static unsigned long pid_hash(ERR_STATE *a) */
static unsigned long pid_hash(const void *a_void) static unsigned long pid_hash(const void *a_void)
{ {
return(((ERR_STATE *)a_void)->pid*13); return(((const ERR_STATE *)a_void)->pid*13);
} }
/* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */ /* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */
static int pid_cmp(const void *a_void, const void *b_void) static int pid_cmp(const void *a_void, const void *b_void)
{ {
return((int)((long)((ERR_STATE *)a_void)->pid - return((int)((long)((const ERR_STATE *)a_void)->pid -
(long)((ERR_STATE *)b_void)->pid)); (long)((const ERR_STATE *)b_void)->pid));
} }
void ERR_remove_state(unsigned long pid) void ERR_remove_state(unsigned long pid)
@ -1075,7 +1075,7 @@ void ERR_add_error_data(int num, ...)
else else
str=p; str=p;
} }
BUF_strlcat(str,a,s+1); BUF_strlcat(str,a,(size_t)s+1);
} }
} }
ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING); ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);

3
crypto/evp/evp_pbe.c
View File

@ -106,7 +106,8 @@ int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
static int pbe_cmp(const char * const *a, const char * const *b) static int pbe_cmp(const char * const *a, const char * const *b)
{ {
EVP_PBE_CTL **pbe1 = (EVP_PBE_CTL **) a, **pbe2 = (EVP_PBE_CTL **)b; const EVP_PBE_CTL * const *pbe1 = (const EVP_PBE_CTL * const *) a,
* const *pbe2 = (const EVP_PBE_CTL * const *)b;
return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid); return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid);
} }

2
crypto/evp/evp_pkey.c
View File

@ -414,8 +414,6 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
default: default:
EVPerr(EVP_F_EVP_PKCS8_SET_BROKEN,EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE); EVPerr(EVP_F_EVP_PKCS8_SET_BROKEN,EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);
return NULL; return NULL;
break;
} }
} }

8
crypto/evp/names.c
View File

@ -66,9 +66,9 @@ int EVP_add_cipher(const EVP_CIPHER *c)
{ {
int r; int r;
r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c); r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
if (r == 0) return(0); if (r == 0) return(0);
r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c); r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
return(r); return(r);
} }
@ -78,9 +78,9 @@ int EVP_add_digest(const EVP_MD *md)
const char *name; const char *name;
name=OBJ_nid2sn(md->type); name=OBJ_nid2sn(md->type);
r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md); r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
if (r == 0) return(0); if (r == 0) return(0);
r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(char *)md); r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md);
if (r == 0) return(0); if (r == 0) return(0);
if (md->type != md->pkey_type) if (md->type != md->pkey_type)

14
crypto/lhash/lhash.c
View File

@ -180,7 +180,7 @@ void *lh_insert(LHASH *lh, void *data)
{ {
unsigned long hash; unsigned long hash;
LHASH_NODE *nn,**rn; LHASH_NODE *nn,**rn;
const void *ret; void *ret;
lh->error=0; lh->error=0;
if (lh->up_load <= (lh->num_items*LH_LOAD_MULT/lh->num_nodes)) if (lh->up_load <= (lh->num_items*LH_LOAD_MULT/lh->num_nodes))
@ -211,14 +211,14 @@ void *lh_insert(LHASH *lh, void *data)
(*rn)->data=data; (*rn)->data=data;
lh->num_replace++; lh->num_replace++;
} }
return((void *)ret); return(ret);
} }
void *lh_delete(LHASH *lh, const void *data) void *lh_delete(LHASH *lh, const void *data)
{ {
unsigned long hash; unsigned long hash;
LHASH_NODE *nn,**rn; LHASH_NODE *nn,**rn;
const void *ret; void *ret;
lh->error=0; lh->error=0;
rn=getrn(lh,data,&hash); rn=getrn(lh,data,&hash);
@ -242,14 +242,14 @@ void *lh_delete(LHASH *lh, const void *data)
(lh->down_load >= (lh->num_items*LH_LOAD_MULT/lh->num_nodes))) (lh->down_load >= (lh->num_items*LH_LOAD_MULT/lh->num_nodes)))
contract(lh); contract(lh);
return((void *)ret); return(ret);
} }
void *lh_retrieve(LHASH *lh, const void *data) void *lh_retrieve(LHASH *lh, const void *data)
{ {
unsigned long hash; unsigned long hash;
LHASH_NODE **rn; LHASH_NODE **rn;
const void *ret; void *ret;
lh->error=0; lh->error=0;
rn=getrn(lh,data,&hash); rn=getrn(lh,data,&hash);
@ -264,7 +264,7 @@ void *lh_retrieve(LHASH *lh, const void *data)
ret= (*rn)->data; ret= (*rn)->data;
lh->num_retrieve++; lh->num_retrieve++;
} }
return((void *)ret); return(ret);
} }
static void doall_util_fn(LHASH *lh, int use_arg, LHASH_DOALL_FN_TYPE func, static void doall_util_fn(LHASH *lh, int use_arg, LHASH_DOALL_FN_TYPE func,
@ -339,7 +339,7 @@ static void expand(LHASH *lh)
{ {
j=(int)lh->num_alloc_nodes*2; j=(int)lh->num_alloc_nodes*2;
n=(LHASH_NODE **)OPENSSL_realloc(lh->b, n=(LHASH_NODE **)OPENSSL_realloc(lh->b,
(unsigned int)sizeof(LHASH_NODE *)*j); (int)(sizeof(LHASH_NODE *)*j));
if (n == NULL) if (n == NULL)
{ {
/* fputs("realloc error in lhash",stderr); */ /* fputs("realloc error in lhash",stderr); */

6
crypto/objects/o_names.c
View File

@ -111,8 +111,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
static int obj_name_cmp(const void *a_void, const void *b_void) static int obj_name_cmp(const void *a_void, const void *b_void)
{ {
int ret; int ret;
OBJ_NAME *a = (OBJ_NAME *)a_void; const OBJ_NAME *a = (const OBJ_NAME *)a_void;
OBJ_NAME *b = (OBJ_NAME *)b_void; const OBJ_NAME *b = (const OBJ_NAME *)b_void;
ret=a->type-b->type; ret=a->type-b->type;
if (ret == 0) if (ret == 0)
@ -133,7 +133,7 @@ static int obj_name_cmp(const void *a_void, const void *b_void)
static unsigned long obj_name_hash(const void *a_void) static unsigned long obj_name_hash(const void *a_void)
{ {
unsigned long ret; unsigned long ret;
OBJ_NAME *a = (OBJ_NAME *)a_void; const OBJ_NAME *a = (const OBJ_NAME *)a_void;
if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type))
{ {

18
crypto/objects/obj_dat.c
View File

@ -115,7 +115,7 @@ static unsigned long add_hash(const void *ca_void)
int i; int i;
unsigned long ret=0; unsigned long ret=0;
unsigned char *p; unsigned char *p;
ADDED_OBJ *ca = (ADDED_OBJ *)ca_void; const ADDED_OBJ *ca = (const ADDED_OBJ *)ca_void;
a=ca->obj; a=ca->obj;
switch (ca->type) switch (ca->type)
@ -149,8 +149,8 @@ static int add_cmp(const void *ca_void, const void *cb_void)
{ {
ASN1_OBJECT *a,*b; ASN1_OBJECT *a,*b;
int i; int i;
ADDED_OBJ *ca = (ADDED_OBJ *)ca_void; const ADDED_OBJ *ca = (const ADDED_OBJ *)ca_void;
ADDED_OBJ *cb = (ADDED_OBJ *)cb_void; const ADDED_OBJ *cb = (const ADDED_OBJ *)cb_void;
i=ca->type-cb->type; i=ca->type-cb->type;
if (i) return(i); if (i) return(i);
@ -161,7 +161,7 @@ static int add_cmp(const void *ca_void, const void *cb_void)
case ADDED_DATA: case ADDED_DATA:
i=(a->length - b->length); i=(a->length - b->length);
if (i) return(i); if (i) return(i);
return(memcmp(a->data,b->data,a->length)); return(memcmp(a->data,b->data,(size_t)a->length));
case ADDED_SNAME: case ADDED_SNAME:
if (a->sn == NULL) return(-1); if (a->sn == NULL) return(-1);
else if (b->sn == NULL) return(1); else if (b->sn == NULL) return(1);
@ -382,8 +382,8 @@ int OBJ_obj2nid(const ASN1_OBJECT *a)
adp=(ADDED_OBJ *)lh_retrieve(added,&ad); adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
if (adp != NULL) return (adp->obj->nid); if (adp != NULL) return (adp->obj->nid);
} }
op=(ASN1_OBJECT **)OBJ_bsearch((char *)&a,(char *)obj_objs,NUM_OBJ, op=(ASN1_OBJECT **)OBJ_bsearch((const char *)&a,(const char *)obj_objs,
sizeof(ASN1_OBJECT *),obj_cmp); NUM_OBJ, sizeof(ASN1_OBJECT *),obj_cmp);
if (op == NULL) if (op == NULL)
return(NID_undef); return(NID_undef);
return((*op)->nid); return((*op)->nid);
@ -521,7 +521,7 @@ int OBJ_ln2nid(const char *s)
adp=(ADDED_OBJ *)lh_retrieve(added,&ad); adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
if (adp != NULL) return (adp->obj->nid); if (adp != NULL) return (adp->obj->nid);
} }
op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs,NUM_LN, op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs, NUM_LN,
sizeof(ASN1_OBJECT *),ln_cmp); sizeof(ASN1_OBJECT *),ln_cmp);
if (op == NULL) return(NID_undef); if (op == NULL) return(NID_undef);
return((*op)->nid); return((*op)->nid);
@ -549,8 +549,8 @@ int OBJ_sn2nid(const char *s)
static int obj_cmp(const void *ap, const void *bp) static int obj_cmp(const void *ap, const void *bp)
{ {
int j; int j;
ASN1_OBJECT *a= *(ASN1_OBJECT **)ap; const ASN1_OBJECT *a= *(ASN1_OBJECT * const *)ap;
ASN1_OBJECT *b= *(ASN1_OBJECT **)bp; const ASN1_OBJECT *b= *(ASN1_OBJECT * const *)bp;
j=(a->length - b->length); j=(a->length - b->length);
if (j) return(j); if (j) return(j);