1 files changed, 47 insertions, 41 deletions

diff --git a/fticks.c b/fticks.c
index f8b4c20..0918aa5 100644
--- a/fticks.c
+++ b/fticks.c
@@ -17,55 +17,61 @@ fticks_configure(struct options *options,
     const char *reporting = (const char *) *reportingp;
     const char *mac = (const char *) *macp;
 
-    if (reporting == NULL)
-	goto out;
-    if (strcasecmp(reporting, "None") == 0)
-	options->fticks_reporting = RSP_FTICKS_REPORTING_NONE;
-    else if (strcasecmp(reporting, "Basic") == 0)
-	options->fticks_reporting = RSP_FTICKS_REPORTING_BASIC;
-    else if (strcasecmp(reporting, "Full") == 0)
-	options->fticks_reporting = RSP_FTICKS_REPORTING_FULL;
-    else {
-	debugx(1, DBG_ERR, "config error: invalid FTicksReporting value: %s",
-	       reporting);
-	r = 1;
-	goto out;
+    /* Set defaults.  */
+    options->fticks_reporting = RSP_FTICKS_REPORTING_NONE;
+    options->fticks_mac = RSP_FTICKS_MAC_VENDOR_KEY_HASHED;
+
+    if (reporting != NULL) {
+	if (strcasecmp(reporting, "None") == 0)
+	    options->fticks_reporting = RSP_FTICKS_REPORTING_NONE;
+	else if (strcasecmp(reporting, "Basic") == 0)
+	    options->fticks_reporting = RSP_FTICKS_REPORTING_BASIC;
+	else if (strcasecmp(reporting, "Full") == 0)
+	    options->fticks_reporting = RSP_FTICKS_REPORTING_FULL;
+	else {
+	    debugx(1, DBG_ERR,
+		   "config error: invalid FTicksReporting value: %s",
+		   reporting);
+	    r = 1;
+	}
     }
 
-    if (mac == NULL)
-	goto out;
-    if (strcasecmp(mac, "Static") == 0)
-	options->fticks_mac = RSP_FTICKS_MAC_STATIC;
-    else if (strcasecmp(mac, "Original") == 0)
-	options->fticks_mac = RSP_FTICKS_MAC_ORIGINAL;
-    else if (strcasecmp(mac, "VendorHashed") == 0)
-	options->fticks_mac = RSP_FTICKS_MAC_VENDOR_HASHED;
-    else if (strcasecmp(mac, "VendorKeyHashed") == 0)
-	options->fticks_mac = RSP_FTICKS_MAC_VENDOR_KEY_HASHED;
-    else if (strcasecmp(mac, "FullyHashed") == 0)
-	options->fticks_mac = RSP_FTICKS_MAC_FULLY_HASHED;
-    else if (strcasecmp(mac, "FullyKeyHashed") == 0)
-	options->fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED;
-    else {
-	debugx(1, DBG_ERR, "config error: invalid FTicksMAC value: %s", mac);
-	r = 1;
-	goto out;
+    if (mac != NULL) {
+	if (strcasecmp(mac, "Static") == 0)
+	    options->fticks_mac = RSP_FTICKS_MAC_STATIC;
+	else if (strcasecmp(mac, "Original") == 0)
+	    options->fticks_mac = RSP_FTICKS_MAC_ORIGINAL;
+	else if (strcasecmp(mac, "VendorHashed") == 0)
+	    options->fticks_mac = RSP_FTICKS_MAC_VENDOR_HASHED;
+	else if (strcasecmp(mac, "VendorKeyHashed") == 0)
+	    options->fticks_mac = RSP_FTICKS_MAC_VENDOR_KEY_HASHED;
+	else if (strcasecmp(mac, "FullyHashed") == 0)
+	    options->fticks_mac = RSP_FTICKS_MAC_FULLY_HASHED;
+	else if (strcasecmp(mac, "FullyKeyHashed") == 0)
+	    options->fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED;
+	else {
+	    debugx(1, DBG_ERR,
+		   "config error: invalid FTicksMAC value: %s", mac);
+	    r = 1;
+	}
     }
 
-    if (*keyp == NULL
-	&& (options->fticks_mac == RSP_FTICKS_MAC_VENDOR_KEY_HASHED
-	    || options->fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) {
+    if (*keyp != NULL) {
+	options->fticks_key = *keyp;
+	if (options->fticks_mac != RSP_FTICKS_MAC_VENDOR_KEY_HASHED
+	    && options->fticks_mac != RSP_FTICKS_MAC_FULLY_KEY_HASHED)
+	    debugx(1, DBG_WARN, "config warning: FTicksKey not used");
+    }
+    else if (options->fticks_reporting != RSP_FTICKS_REPORTING_NONE
+	     && (options->fticks_mac == RSP_FTICKS_MAC_VENDOR_KEY_HASHED
+		 || options->fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) {
 	debugx(1, DBG_ERR,
-	       "config error: FTicksMAC %s requires an FTicksKey", mac);
-	options->fticks_mac = RSP_FTICKS_MAC_STATIC;
+	       "config error: FTicksMAC values VendorKeyHashed and "
+	       "FullyKeyHashed require an FTicksKey");
+	options->fticks_reporting = RSP_FTICKS_REPORTING_NONE;
 	r = 1;
-	goto out;
     }
 
-    if (*keyp != NULL)
-	options->fticks_key = *keyp;
-
-out:
     if (*reportingp != NULL) {
 	free(*reportingp);
 	*reportingp = NULL;