[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5440: Added tests in host_id builder functions for null arguments and invalid sizes for keys and hostna...
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Mon, 10 Jan 2011 17:15:44 -0000
------------------------------------------------------------
revno: 5440
committer: Henrik Ziegeldorf <henrik.ziegeldorf@xxxxxxxxxxxxxx>
branch nick: trunk_branch
timestamp: Mon 2011-01-10 18:05:54 +0100
message:
Added tests in host_id builder functions for null arguments and invalid sizes
for keys and hostnames.
modified:
lib/core/builder.c
--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk
Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'lib/core/builder.c'
--- lib/core/builder.c 2011-01-09 22:18:11 +0000
+++ lib/core/builder.c 2011-01-10 17:05:54 +0000
@@ -3151,6 +3151,10 @@
uint16_t header_len;
uint16_t key_len;
uint16_t fqdn_len;
+
+ /* sanity checks */
+ HIP_IFEL(!wire_host_id, -1, "Given host identity is NULL.\n");
+ HIP_IFEL(!peer_host_id, -1, "Cannot write return value to
NULL-pointer.\n");
HIP_IFEL(!(hip_get_param_type(wire_host_id) == HIP_PARAM_HOST_ID),
-1, "Param has wrong type (not HIP_PARAM_HOST_ID)");
@@ -3161,6 +3165,15 @@
fqdn_len = ntohs(wire_host_id->di_type_length) & 0x0FFF;
key_len = ntohs(wire_host_id->hi_length) -
sizeof(struct hip_host_id_key_rdata);
+
+ HIP_IFEL(fqdn_len >= HIP_HOST_ID_HOSTNAME_LEN_MAX,
+ -1, "Got bad length for domain identifier: %d\n", fqdn_len);
+ HIP_IFEL(key_len > sizeof(peer_host_id->key),
+ -1, "Got bad key length: %d\n", fqdn_len);
+ HIP_IFEL(header_len + key_len + fqdn_len >
hip_get_param_contents_len(wire_host_id) + 4,
+ -1, "Header+ Key + DI length exceeds parameter size: %d\n",
header_len + key_len + fqdn_len);
+
+ // copy the header, key and di
memcpy(peer_host_id, wire_host_id, header_len);
memcpy(peer_host_id->key, wire_host_id->key, key_len);
memcpy(peer_host_id->hostname, &wire_host_id->key[key_len], fqdn_len);
@@ -3184,14 +3197,19 @@
* @see hip_build_param()
*/
int hip_build_param_host_id(struct hip_common *msg,
- const struct hip_host_id *host_id)
+ const struct hip_host_id *const host_id)
{
+ int err = 0;
struct hip_host_id new_host_id;
uint16_t header_len;
uint16_t fqdn_len;
uint16_t key_len;
uint16_t par_len;
+ // sanity checks
+ HIP_IFEL(!msg, -1, "Cannot build host id parameter into given message
(msg is NULL) \n");
+ HIP_IFEL(!host_id, -1, "Cannot build host id parameter with no host id
input (host id is NULL) \n");
+
// eliminate unused space by copying fqdn directly behind the keyrr
header_len = sizeof(struct hip_host_id) -
sizeof(host_id->key) -
@@ -3209,7 +3227,10 @@
hip_set_param_contents_len((struct hip_tlv_common *) &new_host_id,
par_len - sizeof(struct hip_tlv_common));
- return hip_build_param(msg, &new_host_id);
+ err = hip_build_param(msg, &new_host_id);
+
+out_err:
+ return err;
}
/**
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5440: Added tests in host_id builder functions for null arguments and invalid sizes for keys and hostna... - noreply
