[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5442: Refactored hip_any_key_to_hit() and used it in hostid.c instead of all the rsa/dsa specific key_t...
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Mon, 10 Jan 2011 17:15:44 -0000
------------------------------------------------------------
revno: 5442
committer: Henrik Ziegeldorf <henrik.ziegeldorf@xxxxxxxxxxxxxx>
branch nick: trunk_branch
timestamp: Mon 2011-01-10 18:12:52 +0100
message:
Refactored hip_any_key_to_hit() and used it in hostid.c instead of all the
rsa/dsa specific key_to_hit functions.
modified:
lib/core/builder.c
lib/core/builder.h
lib/core/hostid.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-10 17:08:00 +0000
+++ lib/core/builder.c 2011-01-10 17:12:52 +0000
@@ -3817,83 +3817,59 @@
* @param is_dsa 1 if the key is DSA or zero for RSA
* @return zero on success and negative on failure
*/
-static int hip_any_key_to_hit(void *any_key,
- hip_hit_t *hit,
- int is_public,
- int is_dsa)
+int hip_any_key_to_hit(const void *const any_key,
+ hip_hit_t *const hit,
+ const int is_public,
+ const int type)
{
int err = 0, key_rr_len;
unsigned char *key_rr = NULL;
char hostname[HIP_HOST_ID_HOSTNAME_LEN_MAX];
struct hip_host_id_priv *host_id = NULL;
struct hip_host_id *host_id_pub = NULL;
- RSA *rsa_key = any_key;
- DSA *dsa_key = any_key;
+ const RSA *const rsa_key = any_key;
+ const DSA *const dsa_key = any_key;
memset(hostname, 0, HIP_HOST_ID_HOSTNAME_LEN_MAX);
HIP_IFEL(gethostname(hostname, HIP_HOST_ID_HOSTNAME_LEN_MAX - 1), -1,
"gethostname failed\n");
- if (is_dsa) {
+ switch (type) {
+ case HIP_HI_DSA:
HIP_IFEL(((key_rr_len = dsa_to_dns_key_rr(dsa_key, &key_rr)) <= 0), -1,
"key_rr_len\n");
- if (is_public) {
- HIP_IFEL(!(host_id_pub = malloc(sizeof(struct hip_host_id))),
- -ENOMEM, "malloc\n");
- host_id_pub->hi_length = htons(key_rr_len
- + sizeof(struct hip_host_id_key_rdata));
- memcpy(&host_id_pub->key, key_rr, key_rr_len);
- HIP_IFEL(hip_dsa_host_id_to_hit(host_id_pub, hit,
HIP_HIT_TYPE_HASH100),
- -1, "conversion from host id to hit failed\n");
- } else {
- HIP_IFEL(!(host_id = malloc(sizeof(struct hip_host_id_priv))),
- -ENOMEM,
- "malloc\n");
-
- host_id->hi_length = htons(key_rr_len
- + sizeof(struct hip_host_id_key_rdata));
- memcpy(&host_id->key, key_rr, key_rr_len);
- HIP_IFEL(hip_private_dsa_host_id_to_hit(host_id, hit,
- HIP_HIT_TYPE_HASH100),
- -1, "conversion from host id to hit failed\n");
- }
- } else { /* rsa */
+ break;
+ case HIP_HI_RSA:
HIP_IFEL(((key_rr_len = rsa_to_dns_key_rr(rsa_key, &key_rr)) <= 0), -1,
"key_rr_len\n");
- if (is_public) {
- HIP_IFEL(!(host_id_pub = malloc(sizeof(struct hip_host_id))),
- -ENOMEM, "malloc\n");
-
- host_id_pub->hi_length = htons(key_rr_len +
- sizeof(struct
hip_host_id_key_rdata));
-
- memcpy(&host_id_pub->key, key_rr, key_rr_len);
-
- HIP_IFEL(hip_rsa_host_id_to_hit(host_id_pub,
- hit,
- HIP_HIT_TYPE_HASH100),
- -1,
- "conversion from host id to hit failed\n");
- } else {
- HIP_IFEL(!(host_id = malloc(sizeof(struct hip_host_id_priv))),
- -ENOMEM,
- "malloc\n");
-
- host_id->hi_length = htons(key_rr_len +
- sizeof(struct hip_host_id_key_rdata));
- memcpy(&host_id->key, key_rr, key_rr_len);
-
- HIP_IFEL(hip_private_rsa_host_id_to_hit(host_id,
- hit,
- HIP_HIT_TYPE_HASH100),
- -1,
- "conversion from host id to hit failed\n");
- }
+ break;
+ default:
+ HIP_IFEL(1, -1, "Unknown algorithm\n");
+ }
+
+ if (is_public) {
+ HIP_IFEL(!(host_id_pub = malloc(sizeof(struct hip_host_id))),
+ -ENOMEM, "Could not allocate memory for public host
identity\n");
+ host_id_pub->hi_length = htons(key_rr_len + sizeof(struct
hip_host_id_key_rdata));
+ memcpy(&host_id_pub->key, key_rr, key_rr_len);
+ // hip_host_id_to_hit needs to know the algorithm
+ host_id_pub->rdata.algorithm = type;
+ HIP_IFEL(hip_host_id_to_hit(host_id_pub, hit, HIP_HIT_TYPE_HASH100),
+ -1, "conversion from public host id to hit failed\n");
+ } else {
+ HIP_IFEL(!(host_id = malloc(sizeof(struct hip_host_id_priv))),
+ -ENOMEM, "could not allocate memory for private host
identity\n");
+ host_id->hi_length = htons(key_rr_len + sizeof(struct
hip_host_id_key_rdata));
+ memcpy(&host_id->key, key_rr, key_rr_len);
+ // hip_private_host_id_to_hit needs to know the algorithm
+ host_id->rdata.algorithm = type;
+ HIP_IFEL(hip_private_host_id_to_hit(host_id, hit,
HIP_HIT_TYPE_HASH100),
+ -1, "conversion from private host id to hit failed\n");
}
HIP_DEBUG_HIT("hit", hit);
HIP_DEBUG("hi is %s %s\n", (is_public ? "public" : "private"),
- (is_dsa ? "dsa" : "rsa"));
+ (type == HIP_HI_DSA ? "dsa" : "rsa"));
out_err:
free(key_rr);
@@ -3903,32 +3879,6 @@
}
/**
- * translate a private RSA key to a HIT
- *
- * @param rsa_key the RSA key in OpenSSL format
- * @param hit the resulting HIT will be stored here
- * @return zero on success and negative on failure
- */
-int hip_private_rsa_to_hit(RSA *rsa_key,
- struct in6_addr *hit)
-{
- return hip_any_key_to_hit(rsa_key, hit, 0, 0);
-}
-
-/**
- * translate a private DSA key to a HIT
- *
- * @param dsa_key the DSA key in OpenSSL format
- * @param hit the resulting HIT will be stored here
- * @return zero on success and negative on failure
- */
-int hip_private_dsa_to_hit(DSA *dsa_key,
- struct in6_addr *hit)
-{
- return hip_any_key_to_hit(dsa_key, hit, 0, 1);
-}
-
-/**
* Build a @c RELAY_TO parameter to the HIP packet @c msg.
*
* @param msg a pointer to a HIP packet common header
=== modified file 'lib/core/builder.h'
--- lib/core/builder.h 2011-01-10 17:08:00 +0000
+++ lib/core/builder.h 2011-01-10 17:12:52 +0000
@@ -235,6 +235,10 @@
struct endpoint_hip **endpoint,
se_hip_flags endpoint_flags,
const char *const hostname);
+int hip_any_key_to_hit(const void *const any_key,
+ hip_hit_t *const hit,
+ const int is_public,
+ const int type);
int hip_build_param_reg_info(struct hip_common *msg,
const void *service_list,
const unsigned int service_count);
=== modified file 'lib/core/hostid.c'
--- lib/core/hostid.c 2011-01-09 22:18:11 +0000
+++ lib/core/hostid.c 2011-01-10 17:12:52 +0000
@@ -610,6 +610,12 @@
dsa_key_rr_len = dsa_to_dns_key_rr(dsa_key, &dsa_key_rr);
HIP_IFEL(dsa_key_rr_len <= 0, -EFAULT, "dsa_key_rr_len <=
0\n");
+ if ((err = hip_any_key_to_hit(dsa_key, &dsa_lhi.hit, 0,
HIP_HI_DSA))) {
+ HIP_ERROR("Conversion from DSA to HIT failed\n");
+ goto out_err;
+ }
+ HIP_DEBUG_HIT("DSA HIT", &dsa_pub_lhi.hit);
+
if ((err = dsa_to_hip_endpoint(dsa_key, &endpoint_dsa_hip,
HIP_ENDPOINT_FLAG_ANON,
hostname))) {
@@ -617,11 +623,6 @@
goto out_err;
}
- if ((err = hip_private_dsa_to_hit(dsa_key, &dsa_lhi.hit))) {
- HIP_ERROR("Conversion from DSA to HIT failed\n");
- goto out_err;
- }
-
} else { /* pub */
if ((err = load_dsa_private_key(dsa_filenamebase_pub,
@@ -635,10 +636,7 @@
HIP_IFEL(dsa_pub_key_rr_len <= 0, -EFAULT,
"dsa_pub_key_rr_len <= 0\n");
- HIP_DEBUG_HIT("DSA HIT", &dsa_lhi.hit);
-
- if ((err = hip_private_dsa_to_hit(dsa_pub_key,
- &dsa_pub_lhi.hit))) {
+ if ((err = hip_any_key_to_hit(dsa_pub_key, &dsa_pub_lhi.hit,
0, HIP_HI_DSA))) {
HIP_ERROR("Conversion from DSA to HIT failed\n");
goto out_err;
}
@@ -666,7 +664,7 @@
goto out_err;
}
- if ((err = hip_private_rsa_to_hit(rsa_key, &rsa_lhi.hit))) {
+ if ((err = hip_any_key_to_hit(rsa_key, &rsa_lhi.hit, 0,
HIP_HI_RSA))) {
HIP_ERROR("Conversion from RSA to HIT failed\n");
goto out_err;
}
@@ -686,7 +684,7 @@
goto out_err;
}
- if ((err = hip_private_rsa_to_hit(rsa_pub_key, &rsa_pub_lhi.hit)))
{
+ if ((err = hip_any_key_to_hit(rsa_pub_key, &rsa_pub_lhi.hit, 0,
HIP_HI_RSA))) {
HIP_ERROR("Conversion from RSA to HIT failed\n");
goto out_err;
}
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5442: Refactored hip_any_key_to_hit() and used it in hostid.c instead of all the rsa/dsa specific key_t... - noreply
