Key exchange methods changed so they do not depend on the Certificate

type (GNUTLS_KX_X509PKI_* renamed to GNUTLS_KX_*).

diff --git a/NEWS b/NEWS
index 6e728cbf45352210c6afcbe91b9667bd797e87e5..6096cacf17678a11fe6d1ecad8c815892cc1bc3d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ Version ?.?.?
 - Added gnutls_x509pki_set_trust_mem() and gnutls_x509pki_set_key_mem()
 - Bug fixes in srpcrypt
 - Bug fixes in the Handshake protocol
+- gnutls_check_pending() was renamed to gnutls_record_check_pending()
+- Key exchange methods changed so they do not depend on the Certificate
+  type (GNUTLS_KX_X509PKI_* renamed to GNUTLS_KX_*)
 
 Version 0.3.2 (5/01/2002)
 - Corrected bug which did not allow a client to accept multiple CA names

diff --git a/doc/tex/auth.tex b/doc/tex/auth.tex
index 6ae8abddadedeea361ea0660e96ddd41d40873fc..7104a34939f6b8e2fd2619d6a1e0e7b38b75d363 100644 (file)
--- a/doc/tex/auth.tex
+++ b/doc/tex/auth.tex
@@ -20,16 +20,16 @@ in order to use the TLS ciphersuites which require X.509 certificates.
 \begin{figure}[hbtp]
 \begin{tabular}{|l|p{9cm}|}
 \hline
-X509PKI\_RSA & The RSA algorithm is used to encrypt a key and send it to the peer.
+RSA & The RSA algorithm is used to encrypt a key and send it to the peer.
 The certificate must allow the key to be used for encryption.
 \\
 \hline
-X509PKI\_DHE\_RSA & The RSA algorithm is used to sign Ephemeral Diffie Hellman
+DHE\_RSA & The RSA algorithm is used to sign Ephemeral Diffie Hellman
 parameters which are send to the peer. The key in the certificate must allow
 the key to be used for signing 
 \\
 \hline
-X509PKI\_DHE\_DSS & The DSS\footnote{DSS stands for Digital Signature Standard} algorithm is used to sign Ephemeral Diffie Hellman
+DHE\_DSS & The DSS\footnote{DSS stands for Digital Signature Standard} algorithm is used to sign Ephemeral Diffie Hellman
 parameters which are send to the peer. Currently \gnutls does not support this ciphersuite.
 \\
 \hline

diff --git a/doc/tex/ex1.tex b/doc/tex/ex1.tex
index dd7d2c7af297eec43dfe0be85ffcfcdd6758bda2..20b6587b1902e6a1b872d966009174083935f993 100644 (file)
--- a/doc/tex/ex1.tex
+++ b/doc/tex/ex1.tex
@@ -17,7 +17,7 @@
 #define MSG "GET / HTTP/1.0\r\n\r\n"
 
 const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
-const int kx_priority[] = { GNUTLS_KX_X509PKI_RSA, GNUTLS_KX_X509PKI_DHE_RSA, 0 };
+const int kx_priority[] = { GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, 0 };
 const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
 const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
 const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };

diff --git a/doc/tex/ex2.tex b/doc/tex/ex2.tex
index 3a8dc90ef6562829b78bce176679fa506483cc94..b22693b932dd295950afa649d295247a1162e0fb 100644 (file)
--- a/doc/tex/ex2.tex
+++ b/doc/tex/ex2.tex
@@ -25,7 +25,7 @@ int main()
    char buffer[MAX_BUF + 1];
    GNUTLS_X509PKI_CLIENT_CREDENTIALS xcred;
    const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
-   const int kx_priority[] = { GNUTLS_KX_X509PKI_RSA, 0 };
+   const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
    const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
    const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
    const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
@@ -75,7 +75,7 @@ int main()
     */
    gnutls_compression_set_priority(state, comp_priority);
 
-   /* use GNUTLS_KX_X509PKI_RSA
+   /* use GNUTLS_KX_RSA
     */
    gnutls_kx_set_priority(state, kx_priority);
 

diff --git a/doc/tex/ex3.tex b/doc/tex/ex3.tex
index 226fcdfdb7eb993e143a62efaa550948f93eadf8..3502020ecf53aa811b40c99e0d9c94d7c7c74427 100644 (file)
--- a/doc/tex/ex3.tex
+++ b/doc/tex/ex3.tex
@@ -61,7 +61,7 @@ int print_info(GNUTLS_STATE state)
 
       /* Check if we have been using ephemeral Diffie Hellman.
        */
-      if (kx == GNUTLS_KX_X509PKI_DHE_RSA || kx == GNUTLS_KX_X509PKI_DHE_DSS) {
+      if (kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS) {
          printf("\n- Ephemeral DH using prime of %d bits\n",
                 gnutls_x509pki_server_get_dh_bits(state));
       }

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index bf70ff8355a6176a7443a40b256944ee0acbec76..8608f8a0e9d9783f6b1f9d3621784baee40485a3 100644 (file)
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -39,9 +39,9 @@ typedef struct {
 
 static const gnutls_cred_map cred_mappings[] = {
        { GNUTLS_KX_ANON_DH, GNUTLS_ANON    },
-       { GNUTLS_KX_X509PKI_RSA,     GNUTLS_X509PKI },
-       { GNUTLS_KX_X509PKI_DHE_DSS, GNUTLS_X509PKI },
-       { GNUTLS_KX_X509PKI_DHE_RSA, GNUTLS_X509PKI },
+       { GNUTLS_KX_RSA,     GNUTLS_X509PKI },
+       { GNUTLS_KX_DHE_DSS, GNUTLS_X509PKI },
+       { GNUTLS_KX_DHE_RSA, GNUTLS_X509PKI },
        { GNUTLS_KX_SRP,     GNUTLS_SRP     },
        { 0 }
 };
@@ -186,8 +186,8 @@ extern MOD_AUTH_STRUCT srp_auth_struct;
 
 static const gnutls_kx_algo_entry kx_algorithms[] = {
        GNUTLS_KX_ALGO_ENTRY(GNUTLS_KX_ANON_DH, &anon_auth_struct),
-       GNUTLS_KX_ALGO_ENTRY(GNUTLS_KX_X509PKI_RSA, &rsa_auth_struct),
-       GNUTLS_KX_ALGO_ENTRY(GNUTLS_KX_X509PKI_DHE_RSA, &dhe_rsa_auth_struct),
+       GNUTLS_KX_ALGO_ENTRY(GNUTLS_KX_RSA, &rsa_auth_struct),
+       GNUTLS_KX_ALGO_ENTRY(GNUTLS_KX_DHE_RSA, &dhe_rsa_auth_struct),
        GNUTLS_KX_ALGO_ENTRY(GNUTLS_KX_SRP, &srp_auth_struct),
        {0}
 };
@@ -293,54 +293,54 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 
        /* X509PKI_DHE_DSS */
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_DSS_TWOFISH_128_CBC_SHA,
-                                 GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_X509PKI_DHE_DSS,
+                                 GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_DHE_DSS,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_DSS_3DES_EDE_CBC_SHA,
-                                 GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_X509PKI_DHE_DSS,
+                                 GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_DHE_DSS,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_DSS_RIJNDAEL_128_CBC_SHA,
-                                 GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_X509PKI_DHE_DSS,
+                                 GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_DHE_DSS,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_DSS_RIJNDAEL_256_CBC_SHA,
-                                 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_X509PKI_DHE_DSS,
+                                 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_DHE_DSS,
                                  GNUTLS_MAC_SHA),
 
        /* X509PKI_DHE_RSA */
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_RSA_TWOFISH_128_CBC_SHA,
-                                 GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_X509PKI_DHE_RSA,
+                                 GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_DHE_RSA,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_RSA_3DES_EDE_CBC_SHA,
-                                 GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_X509PKI_DHE_RSA,
+                                 GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_DHE_RSA,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_RSA_RIJNDAEL_128_CBC_SHA,
-                                 GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_X509PKI_DHE_RSA,
+                                 GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_DHE_RSA,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_DHE_RSA_RIJNDAEL_256_CBC_SHA,
-                                 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_X509PKI_DHE_RSA,
+                                 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_DHE_RSA,
                                  GNUTLS_MAC_SHA),
 
        /* X509PKI_RSA */
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_RSA_NULL_MD5,
                                  GNUTLS_CIPHER_NULL,
-                                 GNUTLS_KX_X509PKI_RSA, GNUTLS_MAC_MD5),
+                                 GNUTLS_KX_RSA, GNUTLS_MAC_MD5),
 
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_RSA_ARCFOUR_SHA,
                                  GNUTLS_CIPHER_ARCFOUR,
-                                 GNUTLS_KX_X509PKI_RSA, GNUTLS_MAC_SHA),
+                                 GNUTLS_KX_RSA, GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_RSA_ARCFOUR_MD5,
                                  GNUTLS_CIPHER_ARCFOUR,
-                                 GNUTLS_KX_X509PKI_RSA, GNUTLS_MAC_MD5),
+                                 GNUTLS_KX_RSA, GNUTLS_MAC_MD5),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_RSA_3DES_EDE_CBC_SHA,
                                  GNUTLS_CIPHER_3DES_CBC,
-                                 GNUTLS_KX_X509PKI_RSA, GNUTLS_MAC_SHA),
+                                 GNUTLS_KX_RSA, GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_RSA_RIJNDAEL_128_CBC_SHA,
-                                 GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_X509PKI_RSA,
+                                 GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_RSA,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_RSA_RIJNDAEL_256_CBC_SHA,
-                                 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_X509PKI_RSA,
+                                 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_RSA,
                                  GNUTLS_MAC_SHA),
        GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_X509PKI_RSA_TWOFISH_128_CBC_SHA,
-                                 GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_X509PKI_RSA,
+                                 GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_RSA,
                                  GNUTLS_MAC_SHA),
 
        {0}

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 632445a28e4464642e9c241132c191dc8f4eb1c0..c9539afdf128fe713cb796b49c34e0bb56824754 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -146,7 +146,7 @@ typedef struct {
 typedef enum ConnectionEnd { GNUTLS_SERVER=1, GNUTLS_CLIENT } ConnectionEnd;
 typedef enum BulkCipherAlgorithm { GNUTLS_CIPHER_NULL=1, GNUTLS_CIPHER_ARCFOUR, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_CIPHER_RIJNDAEL_256_CBC } BulkCipherAlgorithm;
 typedef enum Extensions { GNUTLS_EXTENSION_DNSNAME=0, GNUTLS_EXTENSION_MAX_RECORD_SIZE=1, GNUTLS_EXTENSION_SRP=6 } Extensions;
-typedef enum KXAlgorithm { GNUTLS_KX_X509PKI_RSA=1, GNUTLS_KX_X509PKI_DHE_DSS, GNUTLS_KX_X509PKI_DHE_RSA, GNUTLS_KX_ANON_DH, GNUTLS_KX_SRP } KXAlgorithm;
+typedef enum KXAlgorithm { GNUTLS_KX_RSA=1, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_ANON_DH, GNUTLS_KX_SRP } KXAlgorithm;
 typedef enum CredType { GNUTLS_X509PKI=1, GNUTLS_ANON, GNUTLS_SRP } CredType;
 typedef enum CipherType { CIPHER_STREAM, CIPHER_BLOCK } CipherType;
 typedef enum CompressionMethod { GNUTLS_COMP_NULL=1, GNUTLS_COMP_ZLIB } CompressionMethod;