From 54ca8b0dc915b6fac25de9d7cdaf6154dbbb27da Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Wed, 23 Jan 2013 18:26:12 +0100
Subject: New demo CA for tests.

Update examples config file accordingly.
---
 lib/examples/client.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/examples')

diff --git a/lib/examples/client.conf b/lib/examples/client.conf
index bf57434..1540bbe 100644
--- a/lib/examples/client.conf
+++ b/lib/examples/client.conf
@@ -14,14 +14,14 @@ realm blocking-tls {
     timeout = 1
     retries = 3
     cacertfile = "tests/demoCA/newcerts/01.pem"
-    certfile = "tests/demoCA/newcerts/02.pem"
-    certkeyfile = "tests/demoCA/private/c2key.pem"
+    certfile = "tests/demoCA/newcerts/03.pem"
+    certkeyfile = "tests/demoCA/private/cli1.key"
     #pskstr = "sikrit psk"
-    pskhexstr = "deadbeef4711"
-    pskid = "Client_identity"
-    pskex = "PSK"
+    #pskhexstr = "deadbeef4711"
+    #pskid = "Client_identity"
+    #pskex = "PSK"
     server {
-        hostname = "localhost"
+        hostname = "srv1"
 	service = "2083"
 	secret = "sikrit"
     }
-- 
cgit v1.1


From 7847caaf22f0fadd5532fc6f0525bfd75ef72fef Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Thu, 24 Jan 2013 17:33:08 +0100
Subject: Add PSK example in examples/client.conf.

---
 lib/examples/client.conf | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'lib/examples')

diff --git a/lib/examples/client.conf b/lib/examples/client.conf
index 1540bbe..a19b699 100644
--- a/lib/examples/client.conf
+++ b/lib/examples/client.conf
@@ -16,13 +16,24 @@ realm blocking-tls {
     cacertfile = "tests/demoCA/newcerts/01.pem"
     certfile = "tests/demoCA/newcerts/03.pem"
     certkeyfile = "tests/demoCA/private/cli1.key"
-    #pskstr = "sikrit psk"
-    #pskhexstr = "deadbeef4711"
-    #pskid = "Client_identity"
-    #pskex = "PSK"
     server {
         hostname = "srv1"
 	service = "2083"
 	secret = "sikrit"
     }
 }
+
+realm blocking-tls-psk {
+    type = "TLS"
+    timeout = 1
+    retries = 3
+    #pskstr = "sikrit psk"
+    pskhexstr = "deadbeef4711"
+    pskid = "Client_identity"
+    pskex = "PSK"
+    server {
+        hostname = "srv1"
+	service = "4433"
+	secret = "sikrit"
+    }
+}
-- 
cgit v1.1


From c682577a243902164de1d80f38425a66a4853d82 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Mon, 6 May 2013 12:00:00 +0200
Subject: Revert "Add formal argument 'secret' to two public functions."

This reverts commit 09d1cff2418a900b587b2113f508984f2417cc11.

Conflicts:
	lib/include/radsec/request.h
---
 lib/examples/client-blocking.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/examples')

diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 1303905..cce00bf 100644
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -55,14 +55,14 @@ blocking_client (const char *config_fn, const char *configuration,
 
   if (use_request_object_flag)
     {
-      if (rs_request_create_authn (conn, &request, USER_NAME, USER_PW, SECRET))
+      if (rs_request_create_authn (conn, &request, USER_NAME, USER_PW))
 	goto cleanup;
       if (rs_request_send (request, &resp))
 	goto cleanup;
     }
   else
     {
-      if (rs_packet_create_authn_request (conn, &req, USER_NAME, USER_PW, SECRET))
+      if (rs_packet_create_authn_request (conn, &req, USER_NAME, USER_PW))
 	goto cleanup;
       if (rs_packet_send (req, NULL))
 	goto cleanup;
-- 
cgit v1.1


From b73a7432ab85d5ca8d0683166c2c7cc75553db69 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Wed, 8 May 2013 22:18:27 +0200
Subject: Pass make distcheck.

---
 lib/examples/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/examples')

diff --git a/lib/examples/Makefile.am b/lib/examples/Makefile.am
index bfd31e8..f300627 100644
--- a/lib/examples/Makefile.am
+++ b/lib/examples/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
 AM_CFLAGS = -Wall -Werror -g
 
 noinst_PROGRAMS = client
-- 
cgit v1.1