[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-116-g302fec0

[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=302fec0d6570a74a21f30a32e1d4fd1a717bf574

The branch, master has been updated
       via  302fec0d6570a74a21f30a32e1d4fd1a717bf574 (commit)
       via  d0d0dd1a1610a0923ccb8aa4ae0a281abff2a848 (commit)
       via  9e1f2e229f5e85ed1a7fcca4f042056e81ca5a5a (commit)
       via  6ab06e2e00047cd7e4dc8c24140550e75da4fd84 (commit)
       via  9d49330c3c676105fd81bb6abe069a16ac87750e (commit)
      from  a699a0bbeb3446b0e7e44dbb495afb9ce15dee45 (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 302fec0d6570a74a21f30a32e1d4fd1a717bf574
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 14:21:30 2010 +0100

    Doc fix.

commit d0d0dd1a1610a0923ccb8aa4ae0a281abff2a848
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 14:18:32 2010 +0100

    Fix for GTK-DOC parse breakage.

commit 9e1f2e229f5e85ed1a7fcca4f042056e81ca5a5a
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 14:13:30 2010 +0100

    Ignore gnutlsxx.h too, GTK-DOC doesn't handle C++.

commit 6ab06e2e00047cd7e4dc8c24140550e75da4fd84
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 14:12:26 2010 +0100

    Need crypto.h too.

commit 9d49330c3c676105fd81bb6abe069a16ac87750e
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 14:06:12 2010 +0100

    Improve header ignores.

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

Summary of changes:
 doc/reference/Makefile.am    |   92 +++++++++++++++++++++++-------------------
 lib/includes/gnutls/crypto.h |    3 +-
 lib/x509/crl.c               |    2 +-
 3 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index b24447b..dda2e01 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -64,51 +64,59 @@ EXTRA_HFILES=
 
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=debug.h gnutls_compress.h gnutls_cipher.h                        
\
-       gnutls_buffers.h gnutls_errors.h gnutls_int.h                   \
-       gnutls_handshake.h gnutls_num.h gnutls_algorithms.h             \
-       gnutls_dh.h gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h   \
-       gnutls_db.h gnutls_priority.h gnutls_auth.h auth_anon.h         \
-       gnutls_extensions.h gnutls_random.h x509_b64.h                  \
-       gnutls_v2_compat.h gnutls_errors_int.h gnutls_datum.h           \
-       auth_cert.h gnutls_mpi.h gnutls_pk.h gnutls_record.h            \
-       gnutls_cert.h gnutls_constate.h gnutls_global.h strfile.h       \
-       gnutls_sig.h gnutls_mem.h gnutls_ui.h io_debug.h                \
-       ext_max_record.h gnutls_session_pack.h gnutls_alert.h           \
-       gnutls_str.h gnutls_state.h gnutls_x509.h ext_cert_type.h       \
-       gnutls_rsa_export.h ext_server_name.h auth_dh_common.h          \
-       ext_srp.h gnutls_srp.h auth_srp.h auth_srp_passwd.h auth_psk.h  \
-       auth_psk_passwd.h memmem.h gnutls_helper.h                      \
-       ext_inner_application.h                                         \
-                                                                       \
-       der.h errors.h gstr.h parser_aux.h element.h errors_int.h       \
-       int.h structure.h                                               \
-                                                                       \
-       common.h compat.h pbkdf2-sha1.h                                 \
-                                                                       \
-       openssl_compat.h                                                \
-                                                                       \
-       cipher.h context.h filters.h main.h md.h packet.h               \
-       stream.h types.h                                                \
-                                                                       \
-       gnutls_openpgp.h gnutlsxx.h gnutls_extra_hooks.h                \
-       gnutls_supplemental.h                                           \
-       opencdk.h                                                       \
-                                                                       \
-       config.h                                                        \
-                                                                       \
-       alloca.in.h byteswap.in.h c-ctype.h errno.in.h float+.h         \
+IGNORE_HFILES=compat.h gnutlsxx.h
+
+# cd lib/ && echo *.h | sed 's/crypto.h//'
+IGNORE_HFILES += auth_anon.h auth_cert.h auth_dh_common.h auth_psk.h   \
+       auth_psk_passwd.h auth_srp.h auth_srp_passwd.h config.h         \
+       debug.h ext_cert_type.h ext_max_record.h ext_oprfi.h    \
+       ext_safe_renegotiation.h ext_server_name.h                      \
+       ext_session_ticket.h ext_signature.h ext_srp.h                  \
+       gnutls_algorithms.h gnutls_auth.h gnutls_buffers.h              \
+       gnutls_cert.h gnutls_cipher.h gnutls_cipher_int.h               \
+       gnutls_compress.h gnutls_constate.h gnutls_cryptodev.h          \
+       gnutls_datum.h gnutls_db.h gnutls_dh.h gnutls_errors.h          \
+       gnutls_extensions.h gnutls_global.h gnutls_handshake.h          \
+       gnutls_hash_int.h gnutls_helper.h gnutls_int.h gnutls_kx.h      \
+       gnutls_mem.h gnutls_mpi.h gnutls_num.h gnutls_pk.h              \
+       gnutls_record.h gnutls_rsa_export.h gnutls_session_pack.h       \
+       gnutls_sig.h gnutls_srp.h gnutls_state.h gnutls_str.h           \
+       gnutls_supplemental.h gnutls_v2_compat.h gnutls_x509.h          \
+       random.h x509_b64.h
+
+# cd lib/gl/ && echo *.h
+IGNORE_HFILES += alignof.h alloca.h alloca.in.h arg-nonnull.h          \
+       byteswap.in.h c-ctype.h close-hook.h errno.in.h float+.h        \
        float.in.h gettext.h minmax.h netdb.in.h printf-args.h          \
        printf-parse.h read-file.h size_max.h sockets.h stdbool.in.h    \
-       stdint.in.h stdio-impl.h stdio.in.h stdlib.in.h string.in.h     \
+       stddef.in.h stdint.in.h stdio.h stdio-impl.h stdio.in.h         \
+       stdlib.h stdlib.in.h string.h string.in.h strings.h             \
        strings.in.h str-two-way.h sys_socket.in.h sys_stat.in.h        \
-       time.in.h unistd.in.h vasnprintf.h wchar.in.h xsize.h           \
-                                                                       \
-       alloca.h byteswap.h c-ctype.h errno.h float.h netdb.h stdint.h  \
-       stdio.h stdlib.h string.h strings.h sys_socket.h sys_stat.h     \
-       time.h unistd.h wchar.h stat.h socket.h                         \
-                                                                       \
-       hmac.h  md5.h  memxor.h
+       time.h time.in.h unistd.h unistd.in.h w32sock.h warn-on-use.h   \
+       vasnprintf.h wchar.h wchar.in.h xsize.h
+
+# cd lib/minitasn1/ && echo *.h
+IGNORE_HFILES += element.h gstr.h int.h parser_aux.h structure.h
+
+# cd lib/opencdk/ && echo *.h
+IGNORE_HFILES += context.h filters.h keydb.h main.h opencdk.h packet.h \
+       stream.h types.h
+
+# cd lib/openpgp/ && echo *.h
+IGNORE_HFILES += gnutls_openpgp.h openpgp_int.h
+
+# cd lib/x509/ && echo *.h
+IGNORE_HFILES += common.h pbkdf2-sha1.h x509_int.h
+
+# cd lib/gl/tests/ && echo *.h
+IGNORE_HFILES += arg-nonnull.h intprops.h macros.h signature.h \
+       warn-on-use.h verify.h zerosize-ptr.h
+
+# cd libextra/ && echo *.h
+IGNORE_HFILES += config.h ext_inner_application.h openssl_compat.h
+
+# cd libextra/gl/ && echo *.h
+IGNORE_HFILES += hmac.h md5.h memxor.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 84b1af0..225810e 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -112,8 +112,7 @@ typedef enum
 typedef struct gnutls_crypto_rnd
 {
   int (*init) (void **ctx);
-  int (*rnd) (void *ctx, int /* gnutls_rnd_level_t */ level,
-             void *data, size_t datasize);
+  int (*rnd) (void *ctx, int level, void *data, size_t datasize);
   void (*deinit) (void *ctx);
 } gnutls_crypto_rnd_st;
 
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 92e0ef0..0859acb 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -982,7 +982,7 @@ gnutls_x509_crl_get_extension_info (gnutls_x509_crl_t crl, 
int indx,
  * buffer.
  *
  * Use gnutls_x509_crl_get_extension_info() to extract the OID and
- * critical flag.  Use gnutls_x509_crl_get_extension_by_oid() instead,
+ * critical flag.  Use gnutls_x509_crl_get_extension_info() instead,
  * if you want to get data indexed by the extension OID rather than
  * sequence.
  *


hooks/post-receive
-- 
GNU gnutls