[SCM] GNU gnutls branch, master, updated. gnutls_2_11_3-17-g3e9cfe6

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=3e9cfe6b24e9714f1c2753a836c9de349f5e88e6

The branch, master has been updated
       via  3e9cfe6b24e9714f1c2753a836c9de349f5e88e6 (commit)
       via  f48486b5750693b82385fea779da557bec2e04e8 (commit)
      from  7d02ee76c9304a94e809c668e6348ad4f4cd4ac1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e9cfe6b24e9714f1c2753a836c9de349f5e88e6
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 14 23:11:28 2010 +0200

    Add gnutls_session_channel_binding API.

commit f48486b5750693b82385fea779da557bec2e04e8
Author: Simon Josefsson <address@hidden>
Date:   Thu Oct 14 23:03:56 2010 +0200

    Generated.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                            |   10 +++++++++-
 doc/manpages/Makefile.am        |    1 +
 lib/gnutls_errors.c             |    3 +++
 lib/gnutls_state.c              |   23 +++++++++++++++++++++++
 lib/includes/gnutls/gnutls.h.in |   16 ++++++++++++++++
 lib/libgnutls.map               |    2 ++
 6 files changed, 54 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index acda3fd..2134b80 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,11 @@ See the end for copying conditions.
 
 * Version 2.11.4 (unreleased)
 
+** libgnutls: Add new API gnutls_session_channel_binding.
+The function is used to get the channel binding data.  Currently only
+the "tls-unique" (RFC 5929) channel binding type is supported, through
+the GNUTLS_CB_TLS_UNIQUE type.
+
 ** doc: Added pkcs11.h header file to GTK-DOC manual.
 
 ** build: Update gnulib files.
@@ -14,7 +19,10 @@ See the end for copying conditions.
 ** tests: Add self tests gendh.c.  Speed up Guile self checks.
 
 ** API and ABI modifications:
-No changes since last version.
+gnutls_session_channel_binding: New function.
+gnutls_channel_binding_t: New enumeration.
+GNUTLS_CB_TLS_UNIQUE: New gnutls_channel_binding_t enum member.
+GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE: New error code.
 
 * Version 2.11.3 (released 2010-10-14)
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 97ad516..0285018 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -277,6 +277,7 @@ APIMANS += gnutls_session_set_ptr.3
 APIMANS += gnutls_record_get_direction.3
 APIMANS += gnutls_handshake_set_post_client_hello_function.3
 APIMANS += gnutls_session_enable_compatibility_mode.3
+APIMANS += gnutls_session_channel_binding.3
 APIMANS += gnutls_hex2bin.3
 APIMANS += gnutls_supplemental_get_name.3
 APIMANS += gnutls_dh_set_prime_bits.3
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 1a19dd4..5485db3 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -278,6 +278,9 @@ static const gnutls_error_entry error_algorithms[] = {
   ERROR_ENTRY (N_("Error interfacing with /dev/crypto"),
               GNUTLS_E_CRYPTODEV_IOCTL_ERROR, 1),
 
+  ERROR_ENTRY (N_("Channel binding data not available"),
+              GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE, 1),
+
   ERROR_ENTRY (N_("PKCS #11 error."),
               GNUTLS_E_PKCS11_ERROR, 1),
   ERROR_ENTRY (N_("PKCS #11 initialization error."),
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index f707fca..86e3c00 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1347,3 +1347,26 @@ gnutls_session_enable_compatibility_mode 
(gnutls_session_t session)
 {
   gnutls_record_disable_padding (session);
 }
+
+/**
+ * gnutls_session_channel_binding:
+ * @session: is a #gnutls_session_t structure.
+ * @cbtype: an #gnutls_channel_binding_t enumeration type
+ * @cb: output buffer array with data
+ *
+ * Extract given channel binding data of the @cbtype type.
+ *
+ * Returns: %GNUTLS_E_SUCCESS on success,
+ * %GNUTLS_E_UNIMPLEMENTED_FEATURE if the @cbtype is unsupported,
+ * %GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE if the data is not
+ * currently available, or an error code.
+ *
+ * Since: 2.12.0
+ **/
+int
+gnutls_session_channel_binding (gnutls_session_t session,
+                               gnutls_channel_binding_t cbtype,
+                               gnutls_datum_t *cb)
+{
+  return GNUTLS_E_UNIMPLEMENTED_FEATURE;
+}
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index a5b7d35..9354100 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -625,6 +625,16 @@ extern "C"
     GNUTLS_SEC_PARAM_ULTRA
   } gnutls_sec_param_t;
 
+  /**
+   * gnutls_channel_binding_t:
+   * @GNUTLS_CB_TLS_UNIQUE: "tls-unique" (RFC 5929) channel binding
+   *
+   * Enumeration of support channel binding types.
+   */
+  typedef enum
+    {
+      GNUTLS_CB_TLS_UNIQUE
+    } gnutls_channel_binding_t;
 
 /* If you want to change this, then also change the define in
  * gnutls_int.h, and recompile.
@@ -937,6 +947,10 @@ extern "C"
     gnutls_session_set_finished_function (gnutls_session_t session,
                                          gnutls_finished_callback_func func);
 
+  int gnutls_session_channel_binding (gnutls_session_t session,
+                                     gnutls_channel_binding_t cbtype,
+                                     gnutls_datum_t *cb);
+
 /* checks if this session is a resumed one 
  */
   int gnutls_session_is_resumed (gnutls_session_t session);
@@ -1759,6 +1773,8 @@ extern "C"
 #define GNUTLS_E_CRYPTODEV_IOCTL_ERROR -211
 #define GNUTLS_E_CRYPTODEV_DEVICE_ERROR -212
 
+#define GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE -213
+
 /* PKCS11 related */
 #define GNUTLS_E_PKCS11_ERROR -300
 #define GNUTLS_E_PKCS11_LOAD_ERROR -301
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 2a4c929..5d1fa71 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -689,6 +689,8 @@ GNUTLS_2_11
        gnutls_cipher_decrypt2;
        gnutls_openpgp_privkey_sec_param;
        gnutls_x509_privkey_sec_param;
+
+       gnutls_session_channel_binding;
 } GNUTLS_2_10;
 
 GNUTLS_PRIVATE {


hooks/post-receive
-- 
GNU gnutls