From: Jouni Malinen <j@w1.fi>
Date: Sun, 24 Nov 2013 16:08:45 +0000 (+0200)
Subject: EAP server: Initialize TLS context based on private_key
X-Git-Tag: hostap_2_1~486
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59d343858d881d80d604e5f251b46cfc4b3b8759;p=thirdparty%2Fhostap.git

EAP server: Initialize TLS context based on private_key

It is possible for the authentication server to be configured with a
PKCS #12 file that includes a private key, a server certificate, and a
CA certificate. This combination could result in server_cert and ca_cert
parameters not being present and that should still result in TLS context
getting initialized.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/src/ap/authsrv.c b/src/ap/authsrv.c
index 68ad4dc50..8bb58a6f6 100644
--- a/src/ap/authsrv.c
+++ b/src/ap/authsrv.c
@@ -133,7 +133,7 @@ int authsrv_init(struct hostapd_data *hapd)
 #ifdef EAP_TLS_FUNCS
 	if (hapd->conf->eap_server &&
 	    (hapd->conf->ca_cert || hapd->conf->server_cert ||
-	     hapd->conf->dh_file)) {
+	     hapd->conf->private_key || hapd->conf->dh_file)) {
 		struct tls_connection_params params;
 
 		hapd->ssl_ctx = tls_init(NULL);