Corrected bugs in examples.

diff --git a/doc/tex/ex1.tex b/doc/tex/ex1.tex
index 6f1ab1d8a84e213104f79564573c4301ac3e0808..98c5bf12290496719ba3e5f56de82291f08452b0 100644 (file)
--- a/doc/tex/ex1.tex
+++ b/doc/tex/ex1.tex
@@ -80,7 +80,7 @@ int main()
          free(session);
       }
       
-      gnutls_set_transport_ptr( state, sd);
+      gnutls_transport_set_ptr( state, sd);
 
       /* Perform the TLS handshake
        */

diff --git a/doc/tex/ex3.tex b/doc/tex/ex3.tex
index bed011bf301f7d9549b877539e923df01517f605..cad039682f63863390b8dea536dee78a52d40645 100644 (file)
--- a/doc/tex/ex3.tex
+++ b/doc/tex/ex3.tex
@@ -36,29 +36,29 @@ int print_info(GNUTLS_STATE state)
              gnutls_dh_get_bits(state));
       break;
    case GNUTLS_CRD_CERTIFICATE:
-      /* in case of X509 PKI
+      /* in case of certificate authentication
        */
       cert_list = gnutls_certificate_get_peers(state, &cert_list_size);
       status = gnutls_certificate_verify_peers(state);
 
       switch (status) {
       case GNUTLS_CERT_NOT_TRUSTED:
-         printf("- Peer's X509 Certificate was NOT verified\n");
+         printf("- Peer's certificate was NOT verified\n");
          break;
       case GNUTLS_CERT_EXPIRED:
-         printf("- Peer's X509 Certificate was verified but is expired\n");
+         printf("- Peer's certificate was verified but is expired\n");
          break;
       case GNUTLS_CERT_TRUSTED:
-         printf("- Peer's X509 Certificate was verified\n");
+         printf("- Peer's certificate was verified\n");
          break;
       case GNUTLS_CERT_NONE:
          printf("- Peer did not send any X509 Certificate.\n");
          break;
       case GNUTLS_CERT_CORRUPTED:
-         printf("- Peer's X509 Certificate was corrupt\n");
+         printf("- Peer's certificate was corrupt\n");
          break;
       case GNUTLS_CERT_REVOKED:
-         printf("- Peer's X509 Certificate was revoked\n");
+         printf("- Peer's certificate was revoked\n");
          break;
       }
 
@@ -72,7 +72,7 @@ int print_info(GNUTLS_STATE state)
       /* if the certificate list is available, then
        * print some information about it.
        */
-      if (cert_list_size > 0) {
+      if (cert_list_size > 0 && gnutls_cert_type_get(state) == GNUTLS_CRT_X509) {
          char digest[20];
          char serial[40];
          int digest_size = sizeof(digest), i;
@@ -119,7 +119,10 @@ int print_info(GNUTLS_STATE state)
    }
 
    tmp = gnutls_protocol_get_name(gnutls_protocol_get_version(state));
-   printf("- Version: %s\n", tmp);
+   printf("- Protocol: %s\n", tmp);
+
+   tmp = gnutls_cert_type_get_name( gnutls_cert_type_get(state));
+   printf("- Certificate Type: %s\n", tmp);
 
    tmp = gnutls_compression_get_name(gnutls_compression_get(state));
    printf("- Compression: %s\n", tmp);

diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex
index e2ac90fc30d34381fe2c3c1d45c8cc9dba0b3f69..0f6d1247fdfa285039886dd07c6b41f70579d1e7 100644 (file)
--- a/doc/tex/serv1.tex
+++ b/doc/tex/serv1.tex
@@ -80,7 +80,7 @@ void print_info(GNUTLS_STATE state)
    printf("\n");
 
    /* print srp specific data */
-   if (gnutls_get_auth_type(state) == GNUTLS_CRD_SRP) {
+   if (gnutls_auth_get_type(state) == GNUTLS_CRD_SRP) {
          printf("\n- User '%s' connected\n",
                 gnutls_srp_server_get_username( state));
    }
@@ -137,15 +137,15 @@ int main()
       fprintf(stderr, "X509 PARSE ERROR\nDid you have ca.pem?\n");
       exit(1);
    }
-   if (gnutls_certifcate_set_x509_key_file(x509_cred, CERTFILE, KEYFILE) < 0) {
+   if (gnutls_certificate_set_x509_key_file(x509_cred, CERTFILE, KEYFILE) < 0) {
       fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n");
       exit(1);
    }
    /* SRP_PASSWD a password file (created with the included crypt utility) 
     * Read README.crypt prior to using SRP.
     */
-   gnutls_srp_allocateserver_sc(&srp_cred);
-   gnutls_srp_set_server_cred(srp_cred, SRP_PASSWD, SRP_PASSWD_CONF);
+   gnutls_srp_allocate_server_sc(&srp_cred);
+   gnutls_srp_set_server_cred_file(srp_cred, SRP_PASSWD, SRP_PASSWD_CONF);
 
 
    /* Socket operations