From: Linus Nordberg <linus@nordberg.se>
Date: Thu, 24 Jan 2013 16:32:18 +0000 (+0100)
Subject: Do the test for PSK properly.
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=10fce2b693e8483d9cc7c024c1a2cd66e8fbef27

Do the test for PSK properly.

Fixes 823ea9ba.

Conflicts:
	lib/event.c
---

diff --git a/lib/event.c b/lib/event.c
index 6b7ba48..ff64348 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -247,9 +247,7 @@ event_on_connect (struct rs_connection *conn, struct rs_message *msg)
   assert (conn->active_peer);
 
 #if defined (RS_ENABLE_TLS)
-  if ((conn->realm->type == RS_CONN_TYPE_TLS
-       || conn->realm->type == RS_CONN_TYPE_DTLS)
-      && conn->active_peer->transport_cred->type != RS_CRED_TLS_PSK)
+  if (conn_type_tls(conn) && !conn_cred_psk(conn))
     if (tls_verify_cert (conn) != RSE_OK)
       {
         rs_debug (("%s: server cert verification failed\n", __func__));