summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-05-16 19:28:34 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-05-16 19:28:34 +0200
commit3fea6560caf3ed5530363e7fe119102904794595 (patch)
tree1d1f4bee442935176bba134ca2ec2db2b08c3b78
parent162e146a56bb692a5190a709224cc4b0e6abdd04 (diff)
downloadgnutls-3fea6560caf3ed5530363e7fe119102904794595.tar.gz
Revert "updated examples"
This reverts commit 559614fc7a288bf6eaf36ebe696e07b150c96be5.
-rw-r--r--doc/examples/ex-client-dtls.c3
-rw-r--r--doc/examples/ex-client-resume.c3
-rw-r--r--doc/examples/ex-client-srp.c5
-rw-r--r--doc/examples/ex-client-x509.c9
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/examples/ex-client-dtls.c b/doc/examples/ex-client-dtls.c
index 377c42e20c..21e7244a56 100644
--- a/doc/examples/ex-client-dtls.c
+++ b/doc/examples/ex-client-dtls.c
@@ -18,6 +18,7 @@
*/
#define MAX_BUF 1024
+#define CAFILE "/etc/ssl/certs/ca-certificates.crt"
#define MSG "GET / HTTP/1.0\r\n\r\n"
extern int udp_connect (void);
@@ -39,7 +40,7 @@ main (void)
gnutls_certificate_allocate_credentials (&xcred);
/* sets the trusted cas file */
- gnutls_certificate_set_x509_system_trust(xcred);
+ gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM);
gnutls_certificate_set_verify_function (xcred, verify_certificate_callback);
/* Initialize TLS session */
diff --git a/doc/examples/ex-client-resume.c b/doc/examples/ex-client-resume.c
index cfa3aadb0f..c09495007c 100644
--- a/doc/examples/ex-client-resume.c
+++ b/doc/examples/ex-client-resume.c
@@ -16,6 +16,7 @@ extern int tcp_connect (void);
extern void tcp_close (int sd);
#define MAX_BUF 1024
+#define CAFILE "/etc/ssl/certs/ca-certificates.crt"
#define MSG "GET / HTTP/1.0\r\n\r\n"
int
@@ -38,7 +39,7 @@ main (void)
/* X509 stuff */
gnutls_certificate_allocate_credentials (&xcred);
- gnutls_certificate_set_x509_system_trust(xcred);
+ gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM);
for (t = 0; t < 2; t++)
{ /* connect 2 times to the server */
diff --git a/doc/examples/ex-client-srp.c b/doc/examples/ex-client-srp.c
index 172c15203f..77840758e9 100644
--- a/doc/examples/ex-client-srp.c
+++ b/doc/examples/ex-client-srp.c
@@ -18,6 +18,7 @@ extern void tcp_close (int sd);
#define MAX_BUF 1024
#define USERNAME "user"
#define PASSWORD "pass"
+#define CAFILE "/etc/ssl/certs/ca-certificates.crt"
#define MSG "GET / HTTP/1.0\r\n\r\n"
int
@@ -35,8 +36,8 @@ main (void)
gnutls_srp_allocate_client_credentials (&srp_cred);
gnutls_certificate_allocate_credentials (&cert_cred);
- gnutls_certificate_set_x509_system_trust(cert_cred);
-
+ gnutls_certificate_set_x509_trust_file (cert_cred, CAFILE,
+ GNUTLS_X509_FMT_PEM);
gnutls_srp_set_client_credentials (srp_cred, USERNAME, PASSWORD);
/* connects to server
diff --git a/doc/examples/ex-client-x509.c b/doc/examples/ex-client-x509.c
index e442886b48..ab46118fbc 100644
--- a/doc/examples/ex-client-x509.c
+++ b/doc/examples/ex-client-x509.c
@@ -17,7 +17,7 @@
*/
#define MAX_BUF 1024
-/* #define CAFILE "/etc/ssl/certs/ca-certificates.crt" */
+#define CAFILE "/etc/ssl/certs/ca-certificates.crt"
#define MSG "GET / HTTP/1.0\r\n\r\n"
extern int tcp_connect (void);
@@ -37,12 +37,9 @@ int main (void)
/* X509 stuff */
gnutls_certificate_allocate_credentials (&xcred);
- /* sets the trusted cas to be the system ones
+ /* sets the trusted cas file
*/
- gnutls_certificate_set_x509_system_trust(xcred);
- /* gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM);
- */
-
+ gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM);
gnutls_certificate_set_verify_function (xcred, _verify_certificate_callback);
/* If client holds a certificate it can be set using the following: