[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-120-g065e014

[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=065e0148db9699eeda5c134c742669bac316938c

The branch, master has been updated
       via  065e0148db9699eeda5c134c742669bac316938c (commit)
      from  e1db6b2392e2464f32957727cd51e4d4fb50b543 (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 065e0148db9699eeda5c134c742669bac316938c
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 16:48:06 2010 +0100

    More GTK-DOC documentation.

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

Summary of changes:
 lib/includes/gnutls/gnutls.h.in |  386 ++++++++++++++++++++++++++++-----------
 1 files changed, 280 insertions(+), 106 deletions(-)

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 1782af0..872b3d3 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -65,85 +65,172 @@ extern "C" {
 #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
 
+  /**
+   * gnutls_cipher_algorithm_t:
+   * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm.
+   * @GNUTLS_CIPHER_NULL: NULL algorithm.
+   * @GNUTLS_CIPHER_ARCFOUR_128: ARCFOUR stream cipher with 128-bit keys.
+   * @GNUTLS_CIPHER_3DES_CBC: 3DES in CBC mode.
+   * @GNUTLS_CIPHER_AES_128_CBC: AES in CBC mode with 128-bit keys.
+   * @GNUTLS_CIPHER_AES_256_CBC: AES in CBC mode with 256-bit keys.
+   * @GNUTLS_CIPHER_ARCFOUR_40: ARCFOUR stream cipher with 40-bit keys.
+   * @GNUTLS_CIPHER_CAMELLIA_128_CBC: Camellia in CBC mode with 128-bit keys.
+   * @GNUTLS_CIPHER_CAMELLIA_256_CBC: Camellia in CBC mode with 256-bit keys.
+   * @GNUTLS_CIPHER_RC2_40_CBC: RC2 in CBC mode with 40-bit keys.
+   * @GNUTLS_CIPHER_DES_CBC: DES in CBC mode (56-bit keys).
+   * @GNUTLS_CIPHER_AES_192_CBC: AES in CBC mode with 192-bit keys.
+   * @GNUTLS_CIPHER_IDEA_PGP_CFB: IDEA in CFB mode.
+   * @GNUTLS_CIPHER_3DES_PGP_CFB: 3DES in CFB mode.
+   * @GNUTLS_CIPHER_CAST5_PGP_CFB: CAST5 in CFB mode.
+   * @GNUTLS_CIPHER_BLOWFISH_PGP_CFB: Blowfish in CFB mode.
+   * @GNUTLS_CIPHER_SAFER_SK128_PGP_CFB: Safer-SK in CFB mode with 128-bit 
keys.
+   * @GNUTLS_CIPHER_AES128_PGP_CFB: AES in CFB mode with 128-bit keys.
+   * @GNUTLS_CIPHER_AES192_PGP_CFB: AES in CFB mode with 192-bit keys.
+   * @GNUTLS_CIPHER_AES256_PGP_CFB: AES in CFB mode with 256-bit keys.
+   * @GNUTLS_CIPHER_TWOFISH_PGP_CFB: Twofish in CFB mode.
+   *
+   * Enumeration of different symmetric encryption algorithms.
+   */
   typedef enum gnutls_cipher_algorithm
   {
     GNUTLS_CIPHER_UNKNOWN = 0,
     GNUTLS_CIPHER_NULL = 1,
-    GNUTLS_CIPHER_ARCFOUR_128,
-    GNUTLS_CIPHER_3DES_CBC,
-    GNUTLS_CIPHER_AES_128_CBC,
-    GNUTLS_CIPHER_AES_256_CBC,
-    GNUTLS_CIPHER_ARCFOUR_40,
-    GNUTLS_CIPHER_CAMELLIA_128_CBC,
-    GNUTLS_CIPHER_CAMELLIA_256_CBC,
+    GNUTLS_CIPHER_ARCFOUR_128 = 2,
+    GNUTLS_CIPHER_3DES_CBC = 3,
+    GNUTLS_CIPHER_AES_128_CBC = 4,
+    GNUTLS_CIPHER_AES_256_CBC = 5,
+    GNUTLS_CIPHER_ARCFOUR_40 = 6,
+    GNUTLS_CIPHER_CAMELLIA_128_CBC = 7,
+    GNUTLS_CIPHER_CAMELLIA_256_CBC = 8,
     GNUTLS_CIPHER_RC2_40_CBC = 90,
-    GNUTLS_CIPHER_DES_CBC,
-    GNUTLS_CIPHER_AES_192_CBC,
+    GNUTLS_CIPHER_DES_CBC = 91,
+    GNUTLS_CIPHER_AES_192_CBC = 92,
 
     /* used only for PGP internals. Ignored in TLS/SSL 
      */
     GNUTLS_CIPHER_IDEA_PGP_CFB = 200,
-    GNUTLS_CIPHER_3DES_PGP_CFB,
-    GNUTLS_CIPHER_CAST5_PGP_CFB,
-    GNUTLS_CIPHER_BLOWFISH_PGP_CFB,
-    GNUTLS_CIPHER_SAFER_SK128_PGP_CFB,
-    GNUTLS_CIPHER_AES128_PGP_CFB,
-    GNUTLS_CIPHER_AES192_PGP_CFB,
-    GNUTLS_CIPHER_AES256_PGP_CFB,
-    GNUTLS_CIPHER_TWOFISH_PGP_CFB
+    GNUTLS_CIPHER_3DES_PGP_CFB = 201,
+    GNUTLS_CIPHER_CAST5_PGP_CFB = 202,
+    GNUTLS_CIPHER_BLOWFISH_PGP_CFB = 203,
+    GNUTLS_CIPHER_SAFER_SK128_PGP_CFB = 204,
+    GNUTLS_CIPHER_AES128_PGP_CFB = 205,
+    GNUTLS_CIPHER_AES192_PGP_CFB = 206,
+    GNUTLS_CIPHER_AES256_PGP_CFB = 207,
+    GNUTLS_CIPHER_TWOFISH_PGP_CFB = 208
   } gnutls_cipher_algorithm_t;
 
+  /**
+   * gnutls_kx_algorithm_t:
+   * @GNUTLS_KX_UNKNOWN: Unknown key-exchange algorithm.
+   * @GNUTLS_KX_RSA: RSA key-exchange algorithm.
+   * @GNUTLS_KX_DHE_DSS: DHE-DSS key-exchange algorithm.
+   * @GNUTLS_KX_DHE_RSA: DHE-RSA key-exchange algorithm.
+   * @GNUTLS_KX_ANON_DH: Anon-DH key-exchange algorithm.
+   * @GNUTLS_KX_SRP: SRP key-exchange algorithm.
+   * @GNUTLS_KX_RSA_EXPORT: RSA-EXPORT key-exchange algorithm.
+   * @GNUTLS_KX_SRP_RSA: SRP-RSA key-exchange algorithm.
+   * @GNUTLS_KX_SRP_DSS: SRP-DSS key-exchange algorithm.
+   * @GNUTLS_KX_PSK: PSK key-exchange algorithm.
+   * @GNUTLS_KX_DHE_PSK: DHE-PSK key-exchange algorithm.
+   *
+   * Enumeration of different key exchange algorithms.
+   */
   typedef enum
   {
     GNUTLS_KX_UNKNOWN = 0,
     GNUTLS_KX_RSA = 1,
-    GNUTLS_KX_DHE_DSS,
-    GNUTLS_KX_DHE_RSA,
-    GNUTLS_KX_ANON_DH,
-    GNUTLS_KX_SRP,
-    GNUTLS_KX_RSA_EXPORT,
-    GNUTLS_KX_SRP_RSA,
-    GNUTLS_KX_SRP_DSS,
-    GNUTLS_KX_PSK,
-    GNUTLS_KX_DHE_PSK
+    GNUTLS_KX_DHE_DSS = 2,
+    GNUTLS_KX_DHE_RSA = 3,
+    GNUTLS_KX_ANON_DH = 4,
+    GNUTLS_KX_SRP = 5,
+    GNUTLS_KX_RSA_EXPORT = 6,
+    GNUTLS_KX_SRP_RSA = 7,
+    GNUTLS_KX_SRP_DSS = 8,
+    GNUTLS_KX_PSK = 9,
+    GNUTLS_KX_DHE_PSK = 10
   } gnutls_kx_algorithm_t;
 
+  /**
+   * gnutls_params_type_t:
+   * @GNUTLS_PARAMS_RSA_EXPORT: Session RSA-EXPORT parameters.
+   * @GNUTLS_PARAMS_DH: Session Diffie-Hellman parameters.
+   *
+   * Enumeration of different TLS session parameter types.
+   */
   typedef enum
-  {
-    GNUTLS_PARAMS_RSA_EXPORT = 1,
-    GNUTLS_PARAMS_DH
-  } gnutls_params_type_t;
+    {
+      GNUTLS_PARAMS_RSA_EXPORT = 1,
+      GNUTLS_PARAMS_DH = 2
+    } gnutls_params_type_t;
 
+  /**
+   * gnutls_credentials_type_t:
+   * @GNUTLS_CRD_CERTIFICATE: Certificate credential.
+   * @GNUTLS_CRD_ANON: Anonymous credential.
+   * @GNUTLS_CRD_SRP: SRP credential.
+   * @GNUTLS_CRD_PSK: PSK credential.
+   * @GNUTLS_CRD_IA: IA credential.
+   *
+   * Enumeration of different credential types.
+   */
   typedef enum
-  {
-    GNUTLS_CRD_CERTIFICATE = 1,
-    GNUTLS_CRD_ANON,
-    GNUTLS_CRD_SRP,
-    GNUTLS_CRD_PSK,
-    GNUTLS_CRD_IA
-  } gnutls_credentials_type_t;
+    {
+      GNUTLS_CRD_CERTIFICATE = 1,
+      GNUTLS_CRD_ANON,
+      GNUTLS_CRD_SRP,
+      GNUTLS_CRD_PSK,
+      GNUTLS_CRD_IA
+    } gnutls_credentials_type_t;
 
 #define GNUTLS_MAC_SHA GNUTLS_MAC_SHA1
 #define GNUTLS_DIG_SHA GNUTLS_DIG_SHA1
 
+  /**
+   * gnutls_mac_algorithm_t:
+   * @GNUTLS_MAC_UNKNOWN: Unknown MAC algorithm.
+   * @GNUTLS_MAC_NULL: NULL MAC algorithm (empty output).
+   * @GNUTLS_MAC_MD5: HMAC-MD5 algorithm.
+   * @GNUTLS_MAC_SHA1: HMAC-SHA-1 algorithm.
+   * @GNUTLS_MAC_RMD160: HMAC-RMD160 algorithm.
+   * @GNUTLS_MAC_MD2: HMAC-MD2 algorithm.
+   * @GNUTLS_MAC_SHA256: HMAC-SHA-256 algorithm.
+   * @GNUTLS_MAC_SHA384: HMAC-SHA-384 algorithm.
+   * @GNUTLS_MAC_SHA512: HMAC-SHA-512 algorithm.
+   * @GNUTLS_MAC_SHA224: HMAC-SHA-224 algorithm.
+   *
+   * Enumeration of different Message Authentication Code (MAC)
+   * algorithms.
+   */
   typedef enum
   {
     GNUTLS_MAC_UNKNOWN = 0,
     GNUTLS_MAC_NULL = 1,
-    GNUTLS_MAC_MD5,
-    GNUTLS_MAC_SHA1,
-    GNUTLS_MAC_RMD160,
-    GNUTLS_MAC_MD2,
-    GNUTLS_MAC_SHA256,
-    GNUTLS_MAC_SHA384,
-    GNUTLS_MAC_SHA512,
-    GNUTLS_MAC_SHA224, /* unused as MAC */
+    GNUTLS_MAC_MD5 = 2,
+    GNUTLS_MAC_SHA1 = 3,
+    GNUTLS_MAC_RMD160 = 4,
+    GNUTLS_MAC_MD2 = 5,
+    GNUTLS_MAC_SHA256 = 6,
+    GNUTLS_MAC_SHA384 = 7,
+    GNUTLS_MAC_SHA512 = 8,
+    GNUTLS_MAC_SHA224 = 9
     /* If you add anything here, make sure you align with
        gnutls_digest_algorithm_t. */
   } gnutls_mac_algorithm_t;
 
-  /* The enumerations here should have the same value with
-     gnutls_mac_algorithm_t.
+  /**
+   * gnutls_digest_algorithm_t:
+   * @GNUTLS_DIG_UNKNOWN: Unknown hash algorithm.
+   * @GNUTLS_DIG_NULL: NULL hash algorithm (empty output).
+   * @GNUTLS_DIG_MD5: MD5 algorithm.
+   * @GNUTLS_DIG_SHA1: SHA-1 algorithm.
+   * @GNUTLS_DIG_RMD160: RMD160 algorithm.
+   * @GNUTLS_DIG_MD2: MD2 algorithm.
+   * @GNUTLS_DIG_SHA256: SHA-256 algorithm.
+   * @GNUTLS_DIG_SHA384: SHA-384 algorithm.
+   * @GNUTLS_DIG_SHA512: SHA-512 algorithm.
+   * @GNUTLS_DIG_SHA224: SHA-224 algorithm.
+   *
+   * Enumeration of different digest (hash) algorithms.
    */
   typedef enum
   {
@@ -156,7 +243,9 @@ extern "C" {
     GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256,
     GNUTLS_DIG_SHA384 = GNUTLS_MAC_SHA384,
     GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512,
-    GNUTLS_DIG_SHA224
+    GNUTLS_DIG_SHA224 = GNUTLS_MAC_SHA224,
+    /* If you add anything here, make sure you align with
+       gnutls_mac_algorithm_t. */
   } gnutls_digest_algorithm_t;
 
   /* exported for other gnutls headers. This is the maximum number of
@@ -172,7 +261,7 @@ extern "C" {
    * @GNUTLS_COMP_ZLIB: Same as %GNUTLS_COMP_DEFLATE.
    * @GNUTLS_COMP_LZO: The non-standard LZO compression method.
    *
-   * Different TLS compression methods.
+   * Enumeration of different TLS compression methods.
    */
   typedef enum
   {
@@ -190,7 +279,7 @@ extern "C" {
    * @GNUTLS_SERVER: Connection end is a server.
    * @GNUTLS_CLIENT: Connection end is a client.
    *
-   * Different TLS connection end types.
+   * Enumeration of different TLS connection end types.
    */
   typedef enum
   {
@@ -203,7 +292,7 @@ extern "C" {
    * @GNUTLS_AL_WARNING: TLS alert of warning severity.
    * @GNUTLS_AL_FATAL: TLS alert of fatal severity.
    *
-   * Different TLS alert severities.
+   * Enumeration of different TLS alert severities.
    */
   typedef enum
   {
@@ -286,11 +375,19 @@ extern "C" {
 
   } gnutls_certificate_status_t;
 
+  /**
+   * gnutls_certificate_request_t:
+   * @GNUTLS_CERT_IGNORE: Ignore certificate.
+   * @GNUTLS_CERT_REQUEST: Request certificate.
+   * @GNUTLS_CERT_REQUIRE: Require certificate.
+   *
+   * Enumeration of certificate request types.
+   */
   typedef enum
   {
-    GNUTLS_CERT_IGNORE,
+    GNUTLS_CERT_IGNORE = 0,
     GNUTLS_CERT_REQUEST = 1,
-    GNUTLS_CERT_REQUIRE
+    GNUTLS_CERT_REQUIRE = 2
   } gnutls_certificate_request_t;
 
   /**
@@ -298,12 +395,12 @@ extern "C" {
    * @GNUTLS_OPENPGP_CERT: Send entire certificate.
    * @GNUTLS_OPENPGP_CERT_FINGERPRINT: Send only certificate fingerprint.
    *
-   * Ways to send OpenPGP certificate.
+   * Enumeration of ways to send OpenPGP certificate.
    */
   typedef enum
     {
-      GNUTLS_OPENPGP_CERT,
-      GNUTLS_OPENPGP_CERT_FINGERPRINT
+      GNUTLS_OPENPGP_CERT = 0,
+      GNUTLS_OPENPGP_CERT_FINGERPRINT = 1
     } gnutls_openpgp_crt_status_t;
 
   /**
@@ -311,7 +408,7 @@ extern "C" {
    * @GNUTLS_SHUT_RDWR: Disallow further receives/sends.
    * @GNUTLS_SHUT_WR: Disallow further sends.
    *
-   * How TLS session should be terminated.  See gnutls_bye().
+   * Enumeration of how TLS session should be terminated.  See gnutls_bye().
    */
   typedef enum
     {
@@ -340,55 +437,102 @@ extern "C" {
       GNUTLS_VERSION_UNKNOWN = 0xff
     } gnutls_protocol_t;
 
+  /**
+   * gnutls_certificate_type_t:
+   * @GNUTLS_CRT_UNKNOWN: Unknown certificate type.
+   * @GNUTLS_CRT_X509: X.509 Certificate.
+   * @GNUTLS_CRT_OPENPGP: OpenPGP certificate.
+   *
+   * Enumeration of different certificate types.
+   */
   typedef enum
-  {
-    GNUTLS_CRT_UNKNOWN = 0,
-    GNUTLS_CRT_X509 = 1,
-    GNUTLS_CRT_OPENPGP
-  } gnutls_certificate_type_t;
+    {
+      GNUTLS_CRT_UNKNOWN = 0,
+      GNUTLS_CRT_X509 = 1,
+      GNUTLS_CRT_OPENPGP = 2
+    } gnutls_certificate_type_t;
 
+  /**
+   * gnutls_x509_crt_fmt_t:
+   * @GNUTLS_X509_FMT_DER: X.509 certificate in DER format (binary).
+   * @GNUTLS_X509_FMT_PEM: X.509 certificate in PEM format (text).
+   *
+   * Enumeration of different certificate encoding formats.
+   */
   typedef enum
-  {
-    GNUTLS_X509_FMT_DER,
-    GNUTLS_X509_FMT_PEM
-  } gnutls_x509_crt_fmt_t;
+    {
+      GNUTLS_X509_FMT_DER = 0,
+      GNUTLS_X509_FMT_PEM = 1
+    } gnutls_x509_crt_fmt_t;
 
+  /**
+   * gnutls_certificate_print_formats_t:
+   * @GNUTLS_CRT_PRINT_FULL: Full information about certificate.
+   * @GNUTLS_CRT_PRINT_ONELINE: Information about certificate in one line.
+   * @GNUTLS_CRT_PRINT_UNSIGNED_FULL: All info for an unsigned certificate.
+   *
+   * Enumeration of different certificate printing variants.
+   */
   typedef enum gnutls_certificate_print_formats
     {
-      GNUTLS_CRT_PRINT_FULL,
-      GNUTLS_CRT_PRINT_ONELINE,
-      GNUTLS_CRT_PRINT_UNSIGNED_FULL
+      GNUTLS_CRT_PRINT_FULL = 0,
+      GNUTLS_CRT_PRINT_ONELINE = 1,
+      GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2
     } gnutls_certificate_print_formats_t;
 
+  /**
+   * gnutls_pk_algorithm_t:
+   * @GNUTLS_PK_UNKNOWN: Unknown public-key algorithm.
+   * @GNUTLS_PK_RSA: RSA public-key algorithm.
+   * @GNUTLS_PK_DSA: DSA public-key algorithm.
+   *
+   * Enumeration of different public-key algorithms.
+   */
   typedef enum
   {
     GNUTLS_PK_UNKNOWN = 0,
     GNUTLS_PK_RSA = 1,
-    GNUTLS_PK_DSA
+    GNUTLS_PK_DSA = 2
   } gnutls_pk_algorithm_t;
 
   const char *gnutls_pk_algorithm_get_name (gnutls_pk_algorithm_t algorithm);
 
-#define GNUTLS_SIGN_RSA_SHA GNUTLS_SIGN_RSA_SHA1
-#define GNUTLS_SIGN_DSA_SHA GNUTLS_SIGN_DSA_SHA1
+  /**
+   * gnutls_sign_algorithm_t:
+   * @GNUTLS_SIGN_UNKNOWN: Unknown signature algorithm.
+   * @GNUTLS_SIGN_RSA_SHA1: Digital signature algorithm RSA with SHA-1
+   * @GNUTLS_SIGN_RSA_SHA: Same as %GNUTLS_SIGN_RSA_SHA1.
+   * @GNUTLS_SIGN_DSA_SHA1: Digital signature algorithm DSA with SHA-1
+   * @GNUTLS_SIGN_DSA_SHA: Same as %GNUTLS_SIGN_DSA_SHA1.
+   * @GNUTLS_SIGN_RSA_MD5: Digital signature algorithm RSA with MD5.
+   * @GNUTLS_SIGN_RSA_MD2: Digital signature algorithm RSA with MD2.
+   * @GNUTLS_SIGN_RSA_RMD160: Digital signature algorithm RSA with RMD-160.
+   * @GNUTLS_SIGN_RSA_SHA256: Digital signature algorithm RSA with SHA-256.
+   * @GNUTLS_SIGN_RSA_SHA384: Digital signature algorithm RSA with SHA-384.
+   * @GNUTLS_SIGN_RSA_SHA512: Digital signature algorithm RSA with SHA-512.
+   * @GNUTLS_SIGN_RSA_SHA224: Digital signature algorithm RSA with SHA-224.
+   *
+   * Enumeration of different digital signature algorithms.
+   */
   typedef enum
-  {
-    GNUTLS_SIGN_UNKNOWN = 0,
-    GNUTLS_SIGN_RSA_SHA1 = 1,
-    GNUTLS_SIGN_DSA_SHA1,
-    GNUTLS_SIGN_RSA_MD5,
-    GNUTLS_SIGN_RSA_MD2,
-    GNUTLS_SIGN_RSA_RMD160,
-    GNUTLS_SIGN_RSA_SHA256,
-    GNUTLS_SIGN_RSA_SHA384,
-    GNUTLS_SIGN_RSA_SHA512,
-    GNUTLS_SIGN_RSA_SHA224
-  } gnutls_sign_algorithm_t;
+    {
+      GNUTLS_SIGN_UNKNOWN = 0,
+      GNUTLS_SIGN_RSA_SHA1 = 1,
+      GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1
+      GNUTLS_SIGN_DSA_SHA1 = 2,
+      GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1
+      GNUTLS_SIGN_RSA_MD5 = 3,
+      GNUTLS_SIGN_RSA_MD2 = 4,
+      GNUTLS_SIGN_RSA_RMD160 = 5,
+      GNUTLS_SIGN_RSA_SHA256 = 6,
+      GNUTLS_SIGN_RSA_SHA384 = 7,
+      GNUTLS_SIGN_RSA_SHA512 = 8,
+      GNUTLS_SIGN_RSA_SHA224 = 9
+    } gnutls_sign_algorithm_t;
 
   const char *
   gnutls_sign_algorithm_get_name (gnutls_sign_algorithm_t sign);
 
-                    
 /* If you want to change this, then also change the define in
  * gnutls_int.h, and recompile.
  */
@@ -572,10 +716,16 @@ extern "C" {
                           gnutls_ext_recv_func recv_func,
                           gnutls_ext_send_func send_func);
 
+  /**
+   * gnutls_server_name_type_t:
+   * @GNUTLS_NAME_DNS: Domain Name System name type.
+   *
+   * Enumeration of different server name types.
+   */
   typedef enum
-  {
-    GNUTLS_NAME_DNS = 1
-  } gnutls_server_name_type_t;
+    {
+      GNUTLS_NAME_DNS = 1
+    } gnutls_server_name_type_t;
 
   int gnutls_server_name_set (gnutls_session_t session,
                              gnutls_server_name_type_t type,
@@ -610,14 +760,19 @@ extern "C" {
                              gnutls_oprfi_callback_func cb,
                              void *userdata);
 
-  /* Supplemental data, RFC 4680. */
+  /**
+   * gnutls_supplemental_data_format_type_t:
+   * @GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA: Supplemental user mapping data.
+   *
+   * Enumeration of different supplemental data types (RFC 4680).
+   */
   typedef enum
     {
       GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA = 0
     } gnutls_supplemental_data_format_type_t;
 
-  const char *gnutls_supplemental_get_name
-  (gnutls_supplemental_data_format_type_t type);
+  const char *
+  gnutls_supplemental_get_name (gnutls_supplemental_data_format_type_t type);
 
   /* SessionTicket, RFC 5077. */
   int gnutls_session_ticket_key_generate (gnutls_datum_t *key);
@@ -625,8 +780,8 @@ extern "C" {
   int gnutls_session_ticket_enable_server (gnutls_session_t session,
                                           const gnutls_datum_t *key);
 
-/* functions to set priority of cipher suites 
- */
+  /* functions to set priority of cipher suites
+   */
   int gnutls_cipher_set_priority (gnutls_session_t session, const int *list);
   int gnutls_mac_set_priority (gnutls_session_t session, const int *list);
   int gnutls_compression_set_priority (gnutls_session_t session,
@@ -1086,6 +1241,13 @@ extern "C" {
   typedef struct gnutls_psk_client_credentials_st
     *gnutls_psk_client_credentials_t;
 
+  /**
+   * gnutls_psk_key_flags:
+   * @GNUTLS_PSK_KEY_RAW: PSK-key in raw format.
+   * @GNUTLS_PSK_KEY_HEX: PSK-key in hex format.
+   *
+   * Enumeration of different PSK key flags.
+   */
   typedef enum gnutls_psk_key_flags
     {
       GNUTLS_PSK_KEY_RAW = 0,
@@ -1150,20 +1312,32 @@ extern "C" {
                                     const char *psk_identity_hint,
                                     gnutls_datum_t *output_key);
 
-
+  /**
+   * gnutls_x509_subject_alt_name_t:
+   * @GNUTLS_SAN_DNSNAME: DNS-name SAN.
+   * @GNUTLS_SAN_RFC822NAME: E-mail address SAN.
+   * @GNUTLS_SAN_URI: URI SAN.
+   * @GNUTLS_SAN_IPADDRESS: IP address SAN.
+   * @GNUTLS_SAN_OTHERNAME: OtherName SAN.
+   * @GNUTLS_SAN_DN: DN SAN.
+   * @GNUTLS_SAN_OTHERNAME_XMPP: Virtual SAN, used by
+   *   gnutls_x509_crt_get_subject_alt_othername_oid().
+   *
+   * Enumeration of different subject alternative names types.
+   */
   typedef enum gnutls_x509_subject_alt_name_t
-  {
-    GNUTLS_SAN_DNSNAME = 1,
-    GNUTLS_SAN_RFC822NAME,
-    GNUTLS_SAN_URI,
-    GNUTLS_SAN_IPADDRESS,
-    GNUTLS_SAN_OTHERNAME,
-    GNUTLS_SAN_DN,
-    /* The following are "virtual" subject alternative name types, in
-       that they are represented by an otherName value and an OID.
-       Used by gnutls_x509_crt_get_subject_alt_othername_oid().  */
-    GNUTLS_SAN_OTHERNAME_XMPP = 1000
-  } gnutls_x509_subject_alt_name_t;
+    {
+      GNUTLS_SAN_DNSNAME = 1,
+      GNUTLS_SAN_RFC822NAME = 2,
+      GNUTLS_SAN_URI = 3,
+      GNUTLS_SAN_IPADDRESS = 4,
+      GNUTLS_SAN_OTHERNAME = 5,
+      GNUTLS_SAN_DN = 6,
+      /* The following are "virtual" subject alternative name types, in
+        that they are represented by an otherName value and an OID.
+        Used by gnutls_x509_crt_get_subject_alt_othername_oid().  */
+      GNUTLS_SAN_OTHERNAME_XMPP = 1000
+    } gnutls_x509_subject_alt_name_t;
 
   struct gnutls_openpgp_crt_int;
   typedef struct gnutls_openpgp_crt_int *gnutls_openpgp_crt_t;


hooks/post-receive
-- 
GNU gnutls