[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5452: Load keys from file hi_file instead of standard files (rsa/dsa_filenamebase).
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Tue, 11 Jan 2011 15:43:27 -0000
------------------------------------------------------------
revno: 5452
committer: Henrik Ziegeldorf <henrik.ziegeldorf@xxxxxxxxxxxxxx>
branch nick: hipl
timestamp: Tue 2011-01-11 16:38:42 +0100
message:
Load keys from file hi_file instead of standard files (rsa/dsa_filenamebase).
This fixes revision 5426, which unintentionally disabled user supplied host
identities.
modified:
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/hostid.c'
--- lib/core/hostid.c 2011-01-11 15:31:03 +0000
+++ lib/core/hostid.c 2011-01-11 15:38:42 +0000
@@ -559,8 +559,8 @@
case ACTION_ADD:
if (!use_default) {
if (!strcmp(hi_fmt, "dsa")) {
- if ((err = load_dsa_private_key(dsa_filenamebase, &dsa_key))) {
- HIP_ERROR("Loading of the DSA key failed\n");
+ if ((err = load_dsa_private_key(hi_file, &dsa_key))) {
+ HIP_ERROR("Failed to load DSA key from file %s\n",
hi_file);
goto out_err;
}
dsa_key_rr_len = dsa_to_dns_key_rr(dsa_key, &dsa_key_rr);
@@ -576,8 +576,8 @@
goto out_err;
}
} else { /*RSA*/
- if ((err = load_rsa_private_key(rsa_filenamebase, &rsa_key))) {
- HIP_ERROR("Loading of the RSA key failed\n");
+ if ((err = load_rsa_private_key(hi_file, &rsa_key))) {
+ HIP_ERROR("Failed to load RSA key from file %s\n",
hi_file);
goto out_err;
}
rsa_key_rr_len = rsa_to_dns_key_rr(rsa_key, &rsa_key_rr);
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5452: Load keys from file hi_file instead of standard files (rsa/dsa_filenamebase). - noreply
