diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-05-10 20:31:08 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-05-10 20:31:08 +0200 |
| commit | 559614fc7a288bf6eaf36ebe696e07b150c96be5 (patch) | |
| tree | 0ba0f6039d6227de7cf487552b7cf964c31474fe | |
| parent | ab145dd9d2bc8e7b66029bce94cc007012c91071 (diff) | |
| download | gnutls-559614fc7a288bf6eaf36ebe696e07b150c96be5.tar.gz | |
updated examples
| -rw-r--r-- | doc/examples/ex-client-dtls.c | 3 | ||||
| -rw-r--r-- | doc/examples/ex-client-resume.c | 3 | ||||
| -rw-r--r-- | doc/examples/ex-client-srp.c | 5 | ||||
| -rw-r--r-- | doc/examples/ex-client-x509.c | 9 |
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/examples/ex-client-dtls.c b/doc/examples/ex-client-dtls.c index 21e7244a56..377c42e20c 100644 --- a/doc/examples/ex-client-dtls.c +++ b/doc/examples/ex-client-dtls.c @@ -18,7 +18,6 @@ */ #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); @@ -40,7 +39,7 @@ main (void) gnutls_certificate_allocate_credentials (&xcred); /* sets the trusted cas file */ - gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM); + gnutls_certificate_set_x509_system_trust(xcred); 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 c09495007c..cfa3aadb0f 100644 --- a/doc/examples/ex-client-resume.c +++ b/doc/examples/ex-client-resume.c @@ -16,7 +16,6 @@ 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 @@ -39,7 +38,7 @@ main (void) /* X509 stuff */ gnutls_certificate_allocate_credentials (&xcred); - gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM); + gnutls_certificate_set_x509_system_trust(xcred); 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 77840758e9..172c15203f 100644 --- a/doc/examples/ex-client-srp.c +++ b/doc/examples/ex-client-srp.c @@ -18,7 +18,6 @@ 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 @@ -36,8 +35,8 @@ main (void) gnutls_srp_allocate_client_credentials (&srp_cred); gnutls_certificate_allocate_credentials (&cert_cred); - gnutls_certificate_set_x509_trust_file (cert_cred, CAFILE, - GNUTLS_X509_FMT_PEM); + gnutls_certificate_set_x509_system_trust(cert_cred); + 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 ab46118fbc..e442886b48 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,9 +37,12 @@ int main (void) /* X509 stuff */ gnutls_certificate_allocate_credentials (&xcred); - /* sets the trusted cas file + /* sets the trusted cas to be the system ones */ - gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM); + 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); /* If client holds a certificate it can be set using the following: |