From f831e92603a86c1997e980927bbad5fe444cdeb8 Mon Sep 17 00:00:00 2001
From: Aaron Jones <aaronmdjones@gmail.com>
Date: Tue, 3 May 2016 17:47:29 +0000
Subject: [PATCH] Fix possible crash when DH parameters are not provided

This has ssld calling strlen() on a NULL value

[ci ckip]
---
 ssld/ssld.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssld/ssld.c b/ssld/ssld.c
index 1bf90771..93491004 100644
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -908,10 +908,10 @@ ssl_new_keys(mod_ctl_t * ctl, mod_ctl_buf_t * ctl_buf)
 	key = buf;
 	buf += strlen(key) + 1;
 	dhparam = buf;
-	if(strlen(dhparam) == 0)
-		dhparam = NULL;
 	buf += strlen(dhparam) + 1;
 	cipher_list = buf;
+	if(strlen(dhparam) == 0)
+		dhparam = NULL;
 	if(strlen(cipher_list) == 0)
 		cipher_list = NULL;