projects
/
libradsec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
214a299
)
Do the test for PSK properly.
author
Linus Nordberg
<linus@nordberg.se>
Thu, 24 Jan 2013 16:32:18 +0000
(17:32 +0100)
committer
Linus Nordberg
<linus@nordberg.se>
Mon, 18 Feb 2013 15:39:16 +0000
(16:39 +0100)
Fixes
823ea9ba
.
Conflicts:
lib/event.c
lib/event.c
patch
|
blob
|
history
diff --git
a/lib/event.c
b/lib/event.c
index
6b7ba48
..
ff64348
100644
(file)
--- 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__));