summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/objects
diff options
context:
space:
mode:
authorderaadt <>2014-06-07 14:41:57 +0000
committerderaadt <>2014-06-07 14:41:57 +0000
commit6e812251158ecbc0733dba21489ebce1248ebb33 (patch)
treec0956c22011ba4358ae4ab650adf0e744f93f40c /src/lib/libcrypto/objects
parent369f4c90b9a7f7864572479745455d29b0777219 (diff)
downloadopenbsd-6e812251158ecbc0733dba21489ebce1248ebb33.tar.gz
openbsd-6e812251158ecbc0733dba21489ebce1248ebb33.tar.bz2
openbsd-6e812251158ecbc0733dba21489ebce1248ebb33.zip
malloc() result does not need a cast.
ok miod
Diffstat (limited to 'src/lib/libcrypto/objects')
-rw-r--r--src/lib/libcrypto/objects/o_names.c2
-rw-r--r--src/lib/libcrypto/objects/obj_dat.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c
index 169b8ae87d..908d947b4e 100644
--- a/src/lib/libcrypto/objects/o_names.c
+++ b/src/lib/libcrypto/objects/o_names.c
@@ -166,7 +166,7 @@ OBJ_NAME_add(const char *name, int type, const char *data)
166 alias = type & OBJ_NAME_ALIAS; 166 alias = type & OBJ_NAME_ALIAS;
167 type &= ~OBJ_NAME_ALIAS; 167 type &= ~OBJ_NAME_ALIAS;
168 168
169 onp = (OBJ_NAME *)malloc(sizeof(OBJ_NAME)); 169 onp = malloc(sizeof(OBJ_NAME));
170 if (onp == NULL) { 170 if (onp == NULL) {
171 /* ERROR */ 171 /* ERROR */
172 return (0); 172 return (0);
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index 301c8a266b..a71b167263 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -276,16 +276,16 @@ OBJ_add_object(const ASN1_OBJECT *obj)
276 return (0); 276 return (0);
277 if ((o = OBJ_dup(obj)) == NULL) 277 if ((o = OBJ_dup(obj)) == NULL)
278 goto err; 278 goto err;
279 if (!(ao[ADDED_NID] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) 279 if (!(ao[ADDED_NID] = malloc(sizeof(ADDED_OBJ))))
280 goto err2; 280 goto err2;
281 if ((o->length != 0) && (obj->data != NULL)) 281 if ((o->length != 0) && (obj->data != NULL))
282 if (!(ao[ADDED_DATA] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) 282 if (!(ao[ADDED_DATA] = malloc(sizeof(ADDED_OBJ))))
283 goto err2; 283 goto err2;
284 if (o->sn != NULL) 284 if (o->sn != NULL)
285 if (!(ao[ADDED_SNAME] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) 285 if (!(ao[ADDED_SNAME] = malloc(sizeof(ADDED_OBJ))))
286 goto err2; 286 goto err2;
287 if (o->ln != NULL) 287 if (o->ln != NULL)
288 if (!(ao[ADDED_LNAME] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) 288 if (!(ao[ADDED_LNAME] = malloc(sizeof(ADDED_OBJ))))
289 goto err2; 289 goto err2;
290 290
291 for (i = ADDED_DATA; i <= ADDED_NID; i++) { 291 for (i = ADDED_DATA; i <= ADDED_NID; i++) {
@@ -467,7 +467,7 @@ OBJ_txt2obj(const char *s, int no_name)
467 /* Work out total size */ 467 /* Work out total size */
468 j = ASN1_object_size(0, i, V_ASN1_OBJECT); 468 j = ASN1_object_size(0, i, V_ASN1_OBJECT);
469 469
470 if ((buf = (unsigned char *)malloc(j)) == NULL) 470 if ((buf = malloc(j)) == NULL)
471 return NULL; 471 return NULL;
472 472
473 p = buf; 473 p = buf;
@@ -756,7 +756,7 @@ OBJ_create(const char *oid, const char *sn, const char *ln)
756 if (i <= 0) 756 if (i <= 0)
757 return (0); 757 return (0);
758 758
759 if ((buf = (unsigned char *)malloc(i)) == NULL) { 759 if ((buf = malloc(i)) == NULL) {
760 OBJerr(OBJ_F_OBJ_CREATE, ERR_R_MALLOC_FAILURE); 760 OBJerr(OBJ_F_OBJ_CREATE, ERR_R_MALLOC_FAILURE);
761 return (0); 761 return (0);
762 } 762 }