[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5427: Include HIPL_SYSCONFDIR in the definition of DEFAULT_HOST_DSA/RSA_KEY_FILE_BASE.
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Mon, 10 Jan 2011 15:00:54 -0000
------------------------------------------------------------
revno: 5427
committer: Henrik Ziegeldorf <henrik.ziegeldorf@xxxxxxxxxxxxxx>
branch nick: trunk_branch
timestamp: Mon 2011-01-10 15:44:16 +0100
message:
Include HIPL_SYSCONFDIR in the definition of
DEFAULT_HOST_DSA/RSA_KEY_FILE_BASE.
modified:
hipd/init.c
lib/core/crypto.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 'hipd/init.c'
--- hipd/init.c 2011-01-07 14:46:07 +0000
+++ hipd/init.c 2011-01-10 14:44:16 +0000
@@ -579,7 +579,7 @@
/* Create default keys if necessary. */
- if (stat(HIPL_SYSCONFDIR DEFAULT_HOST_RSA_KEY_FILE_BASE
DEFAULT_PUB_HI_FILE_NAME_SUFFIX,
+ if (stat(DEFAULT_HOST_RSA_KEY_FILE_BASE DEFAULT_PUB_HI_FILE_NAME_SUFFIX,
&status) && errno == ENOENT) {
HIP_IFEL(hip_serialize_host_id_action(user_msg, ACTION_NEW, 0, 1,
NULL, NULL, RSA_KEY_DEFAULT_BITS,
=== modified file 'lib/core/crypto.h'
--- lib/core/crypto.h 2011-01-03 14:43:03 +0000
+++ lib/core/crypto.h 2011-01-10 14:44:16 +0000
@@ -61,8 +61,8 @@
#define DSA_KEY_DEFAULT_BITS 1024
#define RSA_KEY_DEFAULT_BITS 1024
-#define DEFAULT_HOST_DSA_KEY_FILE_BASE "/hip_host_dsa_key"
-#define DEFAULT_HOST_RSA_KEY_FILE_BASE "/hip_host_rsa_key"
+#define DEFAULT_HOST_DSA_KEY_FILE_BASE HIPL_SYSCONFDIR "/hip_host_dsa_key"
+#define DEFAULT_HOST_RSA_KEY_FILE_BASE HIPL_SYSCONFDIR "/hip_host_rsa_key"
#define DEFAULT_PUB_FILE_SUFFIX ".pub"
#define DEFAULT_PUB_HI_FILE_NAME_SUFFIX "_pub"
=== modified file 'lib/core/hostid.c'
--- lib/core/hostid.c 2011-01-10 14:41:26 +0000
+++ lib/core/hostid.c 2011-01-10 14:44:16 +0000
@@ -446,10 +446,10 @@
int dsa_pub_key_rr_len = 0, rsa_pub_key_rr_len = 0;
hip_hdr numeric_action = 0;
char addrstr[INET6_ADDRSTRLEN], hostname[HIP_HOST_ID_HOSTNAME_LEN_MAX];
- const char *rsa_filenamebase = HIPL_SYSCONFDIR
DEFAULT_HOST_RSA_KEY_FILE_BASE DEFAULT_ANON_HI_FILE_NAME_SUFFIX;
- const char *dsa_filenamebase = HIPL_SYSCONFDIR
DEFAULT_HOST_DSA_KEY_FILE_BASE DEFAULT_ANON_HI_FILE_NAME_SUFFIX;
- const char *rsa_filenamebase_pub = HIPL_SYSCONFDIR
DEFAULT_HOST_RSA_KEY_FILE_BASE DEFAULT_PUB_HI_FILE_NAME_SUFFIX;
- const char *dsa_filenamebase_pub = HIPL_SYSCONFDIR
DEFAULT_HOST_DSA_KEY_FILE_BASE DEFAULT_PUB_HI_FILE_NAME_SUFFIX;
+ const char *rsa_filenamebase = DEFAULT_HOST_RSA_KEY_FILE_BASE
DEFAULT_ANON_HI_FILE_NAME_SUFFIX;
+ const char *dsa_filenamebase = DEFAULT_HOST_DSA_KEY_FILE_BASE
DEFAULT_ANON_HI_FILE_NAME_SUFFIX;
+ const char *rsa_filenamebase_pub = DEFAULT_HOST_RSA_KEY_FILE_BASE
DEFAULT_PUB_HI_FILE_NAME_SUFFIX;
+ const char *dsa_filenamebase_pub = DEFAULT_HOST_DSA_KEY_FILE_BASE
DEFAULT_PUB_HI_FILE_NAME_SUFFIX;
unsigned char *dsa_key_rr = NULL, *rsa_key_rr = NULL;
unsigned char *dsa_pub_key_rr = NULL, *rsa_pub_key_rr = NULL;
DSA *dsa_key = NULL, *dsa_pub_key = NULL;
Other related posts:
