Removed the CRL list parameter from gnutls_certificate_set_x509_trust_*.

diff --git a/ChangeLog b/ChangeLog
index 8604aa42bab616749bb77a192b1cabe99a32cf54..9ecccf76d5148c104c6e046c4173a038313ca6d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2002-03-29 12:12  nmav <nmav@gnutls.org>
+
+       * lib/: gnutls_algorithms.c, gnutls_cipher.c, gnutls_cipher_int.c,
+       gnutls_cipher_int.h, gnutls_compress.c, gnutls_compress_int.c,
+       gnutls_compress_int.h, gnutls_constate.c, gnutls_handshake.c,
+       gnutls_hash_int.c, gnutls_hash_int.h, gnutls_int.h, gnutls_kx.c,
+       gnutls_sig.c, gnutls_srp.c, gnutls_state.c, gnutls_ui.c,
+       x509_sig_check.c:
+
+       Prefixed with underscore several internal functions.  
+
+2002-03-29 11:38  nmav <nmav@gnutls.org>
+
+       * lib/: auth_cert.c, auth_dhe.c, auth_rsa.c, gnutls_algorithms.c,
+       gnutls_algorithms.h, gnutls_cert.c, gnutls_cert.h, gnutls_global.c,
+       gnutls_x509.c:
+
+       removed unneeded functions 
+
+2002-03-29 11:38  nmav <nmav@gnutls.org>
+
+       * src/: cli-gaa.c, cli-gaa.h, cli.c, cli.gaa:
+
+       added crlf option 
+
+2002-03-29 11:16  nmav <nmav@gnutls.org>
+
+       * ChangeLog, doc/TODO, lib/auth_rsa.c, lib/gnutls_int.h,
+       lib/gnutls_pk.c, lib/gnutls_pk.h, lib/gnutls_sig.c, lib/x509_der.c,
+       lib/x509_sig_check.c, src/cli.c, src/serv-gaa.c, src/serv-gaa.h,
+       src/serv.gaa:
+
+       Some cleanups in the certificate authentication. Parameters are 
+       passed together with the length, to avoid abuse.  
+
 2002-03-28 12:46  nmav <nmav@gnutls.org>
 
        * lib/: gnutls_x509.c, x509_b64.c:

diff --git a/doc/tex/ex1.tex b/doc/tex/ex1.tex
index 83bfa5e19ce75a1cd7e5b0a113ef26cdac4b52e3..75bf715b120299f6becafdfd8671b70de3a4391f 100644 (file)
--- a/doc/tex/ex1.tex
+++ b/doc/tex/ex1.tex
@@ -50,7 +50,7 @@ int main()
       fprintf(stderr, "memory error\n");
       exit(1);
    }
-   gnutls_certificate_set_x509_trust_file(xcred, CAFILE, CRLFILE, GNUTLS_X509_FMT_PEM);
+   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/tex/ex2.tex b/doc/tex/ex2.tex
index ff83ed8078d4d5c4edca9f1b470d7d492d47f08d..b0124aaf9cf23c73db74fe9982630efa309a3a10 100644 (file)
--- a/doc/tex/ex2.tex
+++ b/doc/tex/ex2.tex
@@ -42,7 +42,7 @@ int main()
    }
    /* set's the trusted cas file
     */
-   gnutls_certificate_set_x509_trust_file(xcred, CAFILE, CRLFILE, GNUTLS_X509_FMT_PEM);
+   gnutls_certificate_set_x509_trust_file(xcred, CAFILE, GNUTLS_X509_FMT_PEM);
 
    /* connects to server 
     */

diff --git a/doc/tex/ex3.tex b/doc/tex/ex3.tex
index 4fa7ea4c095cd10553d0ae6856e0394d295bcc04..94fdc2d7eb0bf53dd14170f0da97d2757624636c 100644 (file)
--- a/doc/tex/ex3.tex
+++ b/doc/tex/ex3.tex
@@ -52,14 +52,15 @@ int print_info(GNUTLS_STATE state)
             printf("- Peer's certificate is invalid\n");
          if ( status & GNUTLS_CERT_EXPIRED)
             printf("- Peer's certificate is expired\n");
-         if ( status & GNUTLS_CERT_NOT_TRUSTED)
-            printf("- Peer's certificate is not trusted\n");
-         else
-            printf("- Peer's certificate is trusted\n");
          if ( status & GNUTLS_CERT_CORRUPTED)
             printf("- Peer's certificate is corrupted.\n");
          if ( status & GNUTLS_CERT_REVOKED)
             printf("- Peer's certificate is revoked\n");
+
+         if ( status & GNUTLS_CERT_NOT_TRUSTED)
+            printf("- Peer's certificate is not trusted\n");
+         else
+            printf("- Peer's certificate is trusted\n");
       }
 
       /* Check if we have been using ephemeral Diffie Hellman.

diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex
index e7a9ab3546ab2a3c2e700c3d23467861e86ac1ea..ceb3c6bc07aa417c714511f353e5670de4e2bef4 100644 (file)
--- a/doc/tex/serv1.tex
+++ b/doc/tex/serv1.tex
@@ -152,11 +152,13 @@ int main()
       fprintf(stderr, "memory error\n");
       exit(1);
    }
-   if (gnutls_certificate_set_x509_trust_file(x509_cred, CAFILE, CRLFILE) < 0) {
+   if (gnutls_certificate_set_x509_trust_file(x509_cred, CAFILE, 
+      GNUTLS_X509_FMT_PEM) < 0) {
       fprintf(stderr, "X509 PARSE ERROR\nDid you have ca.pem?\n");
       exit(1);
    }
-   if (gnutls_certificate_set_x509_key_file(x509_cred, CERTFILE, KEYFILE) < 0) {
+   if (gnutls_certificate_set_x509_key_file(x509_cred, CERTFILE, KEYFILE, 
+      GNUTLS_X509_FMT_PEM) < 0) {
       fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n");
       exit(1);
    }

diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index 9a7020fe879007442ad513e7cf447a1c1518e4ab..6f582d07d902cd5d43fa739dbab9ad3e792bf480 100644 (file)
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -229,9 +229,9 @@ int gnutls_certificate_allocate_sc( GNUTLS_CERTIFICATE_CREDENTIALS *sc);
 int gnutls_certificate_set_dh_params(GNUTLS_CERTIFICATE_CREDENTIALS res, GNUTLS_DH_PARAMS);
 
 int gnutls_certificate_set_x509_trust_file( GNUTLS_CERTIFICATE_CREDENTIALS res, char* CAFILE, 
-       char* CRLFILE, GNUTLS_X509_CertificateFmt);
-int gnutls_certificate_set_x509_trust_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, const gnutls_datum *CA,  
-       const gnutls_datum *CRL, GNUTLS_X509_CertificateFmt);
+       GNUTLS_X509_CertificateFmt);
+int gnutls_certificate_set_x509_trust_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, 
+       const gnutls_datum *CA, GNUTLS_X509_CertificateFmt);
 
 int gnutls_certificate_set_x509_key_file( GNUTLS_CERTIFICATE_CREDENTIALS res, 
        char *CERTFILE, char* KEYFILE, GNUTLS_X509_CertificateFmt);

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index aff90cf076a1d43ac4116e8f4e1afa555b881fd8..27fb20d4585ede2722b64d3cf56a9903c0b89fb9 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1522,15 +1522,14 @@ opaque *pdata;
   * gnutls_certificate_set_x509_trust_mem - Used to add trusted CAs in a GNUTLS_CERTIFICATE_CREDENTIALS structure
   * @res: is an &GNUTLS_CERTIFICATE_CREDENTIALS structure.
   * @CA: is a list of trusted CAs or a DER certificate
-  * @CRL: is a list of CRLs (ignored for now)
   * @type: is DER or PEM
   *
   * This function adds the trusted CAs in order to verify client
   * certificates. This function may be called multiple times.
   *
   **/
-int gnutls_certificate_set_x509_trust_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, const gnutls_datum *CA,
-                            const gnutls_datum *CRL, GNUTLS_X509_CertificateFmt type)
+int gnutls_certificate_set_x509_trust_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, 
+       const gnutls_datum *CA, GNUTLS_X509_CertificateFmt type)
 {
        int ret, ret2;
 
@@ -1547,7 +1546,6 @@ int gnutls_certificate_set_x509_trust_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, co
   * gnutls_certificate_set_x509_trust_file - Used to add trusted CAs in a GNUTLS_CERTIFICATE_CREDENTIALS structure
   * @res: is an &GNUTLS_CERTIFICATE_CREDENTIALS structure.
   * @CAFILE: is a file containing the list of trusted CAs (DER or PEM list)
-  * @CRLFILE: is a file containing CRLs (ignored for now)
   * @type: is PEM or DER
   *
   * This function sets the trusted CAs in order to verify client
@@ -1555,8 +1553,8 @@ int gnutls_certificate_set_x509_trust_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, co
   * Returns the number of certificate processed.
   *
   **/
-int gnutls_certificate_set_x509_trust_file(GNUTLS_CERTIFICATE_CREDENTIALS res, char *CAFILE,
-                            char *CRLFILE, GNUTLS_X509_CertificateFmt type)
+int gnutls_certificate_set_x509_trust_file(GNUTLS_CERTIFICATE_CREDENTIALS res, 
+               char *CAFILE, GNUTLS_X509_CertificateFmt type)
 {
        int ret, ret2;
 

diff --git a/src/cli.c b/src/cli.c
index 72d289e44f194129888647dd4bfd4c4c347a5c14..7c2dd4aa01549ea452154f4ed7cd51a5f4694d0c 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
    if (x509_cafile != NULL) {
       ret =
          gnutls_certificate_set_x509_trust_file(xcred, x509_cafile,
-                                        x509_crlfile, x509ctype);
+                                        x509ctype);
       if (ret < 0) {
         fprintf(stderr, "Error setting the x509 trust file\n");
       } else {

diff --git a/src/serv.c b/src/serv.c
index fd6f5109e33ea0f8cd53c8c503f75d784b0464fb..404a6fd5b738cf28654ccefc42b8d5dddd5aa91b 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -348,7 +348,7 @@ int main(int argc, char **argv)
 
    if (x509_cafile != NULL) {
       if ((ret=gnutls_certificate_set_x509_trust_file
-         (cert_cred, x509_cafile, x509_crlfile, x509ctype)) < 0) {
+         (cert_cred, x509_cafile, x509ctype)) < 0) {
         fprintf(stderr, "Error reading '%s'\n", x509_cafile);
         exit(1);
       } else {