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-Tag: libradsec-0.0.4~44
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libradsec.git;a=commitdiff_plain;h=9cf549b20eb0ae56afac8c3ddff8725c8c1380db

Do the test for PSK properly.

Fixes 823ea9ba.
---

diff --git a/lib/event.c b/lib/event.c
index 78a9156..e51616a 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -246,9 +246,7 @@ event_on_connect (struct rs_connection *conn, struct rs_packet *pkt)
   assert (!conn->is_connecting);
 
 #if defined (RS_ENABLE_TLS)
-  if ((conn->realm->type == RS_CONN_TYPE_TLS
-       || conn->realm->type == RS_CONN_TYPE_DTLS)
-      && conn->realm->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__));