File curvedns-PRIVATE_KEY_F.patch of Package curvedns

Overview Repositories Revisions Requests Users Attributes Meta

File curvedns-PRIVATE_KEY_F.patch of Package curvedns (Revision 3d3dca78deeed9b43a5ea2b540fc4eb5)

Currently displaying revision 3d3dca78deeed9b43a5ea2b540fc4eb5 , Show latest

diff -rU3 curvedns-0.87/curvedns.c curvedns-mod/curvedns.c
--- curvedns-0.87/curvedns.c	2010-12-28 09:32:54.000000000 +0100
+++ curvedns-mod/curvedns.c	2011-12-09 16:32:02.000000000 +0100
@@ -55,6 +55,8 @@
 	debug_log(DEBUG_FATAL, "Usage: %s <listening IPs (sep. by comma)> <listening port> <target DNS server IP> <target DNS server port>\n\n", argv0);
 	debug_log(DEBUG_FATAL, "Environment options (between []'s are optional):\n");
 	debug_log(DEBUG_FATAL, " CURVEDNS_PRIVATE_KEY\n\tThe hexidecimal representation of the server's private (secret) key\n");
+	debug_log(DEBUG_FATAL, " or CURVEDNS_PRIVATE_KEY_FILE\n\tThe name of a file from which to read the hexidecimal representation of the server's private (secret) key\n");
+	debug_log(DEBUG_FATAL, " or CURVEDNS_PRIVATE_KEY_FD\n\tThe number of a file descriptor from which to read the hexidecimal representation of the server's private (secret) key\n");
 	debug_log(DEBUG_FATAL, " UID\n\tNon-root user id to run under\n");
 	debug_log(DEBUG_FATAL, " GID\n\tNon-root user group id to run under\n");
 	debug_log(DEBUG_FATAL, " [CURVEDNS_SOURCE_IP]\n\tThe IP to bind on when target server is contacted (default: [none])\n");
@@ -64,6 +66,7 @@
 	debug_log(DEBUG_FATAL, " [CURVEDNS_TCP_TIMEOUT]\n\tNumber of seconds before TCP session to client times out (default: 60.0)\n");
 	debug_log(DEBUG_FATAL, " [CURVEDNS_SHARED_SECRETS]\n\tNumber of shared secrets that can be cached (default: 5000)\n");
 	debug_log(DEBUG_FATAL, " [CURVEDNS_DEBUG]\n\tDebug level, 1: fatal, 2: error, 3: warning, 4: info, 5: debug (default: 2)\n");
+	debug_log(DEBUG_FATAL, "Exactly one of the CURVEDNS_PRIVATE_KEY* variables is required.\n");
 	return 1;
 }
 
@@ -138,6 +141,7 @@
 
 int main(int argc, char *argv[]) {
 	int uid, gid, tmp;
+	char *fn, hexkey[65];
 
 	if (argc != 5)
 		return usage(argv[0]);
@@ -174,7 +178,27 @@
 	}
 
 	// Fetch the secret key from environment and setup:
-	if (!misc_getenv_key("CURVEDNS_PRIVATE_KEY", 1, global_secret_key))
+	tmp = -1;
+	if ((fn = getenv("CURVEDNS_PRIVATE_KEY_FILE"))) {
+		if ((tmp = open(fn, O_RDONLY)) < 0) {
+			debug_log(DEBUG_FATAL, "failed to open CURVEDNS_PRIVATE_KEY_FILE\n");
+			return 1;
+		}
+	} else if (!misc_getenv_int("CURVEDNS_PRIVATE_KEY_FD", 0, &tmp)) {
+		tmp = -1;
+	}
+	if (tmp >= 0) {
+		if (read(tmp, hexkey, sizeof(hexkey) - 1) != sizeof(hexkey) - 1) {
+			debug_log(DEBUG_FATAL, "short read from CURVEDNS_PRIVATE_KEY_F*\n");
+			return 1;
+		}
+		close(tmp);
+		hexkey[sizeof(hexkey) - 1] = 0;
+		if (!misc_hex_decode(hexkey, global_secret_key)) {
+			debug_log(DEBUG_FATAL, "read invalid hex data from CURVEDNS_PRIVATE_KEY_F*\n");
+			return 1;
+		}
+	} else if (!misc_getenv_key("CURVEDNS_PRIVATE_KEY", 1, global_secret_key))
 		return 1;
 
 	// Fetch group id:

Places

File curvedns-PRIVATE_KEY_F.patch of Package curvedns (Revision 3d3dca78deeed9b43a5ea2b540fc4eb5)

Places