[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-18-g8f8cea0
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-18-g8f8cea0 |
|
Date: |
Tue, 08 Nov 2011 21:10:20 +0000 |
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=8f8cea0a5359a4734f55ae13c18326f33db3912b
The branch, master has been updated
via 8f8cea0a5359a4734f55ae13c18326f33db3912b (commit)
via 89c3301101f3bc1b16351f0965436a4e0ecfc771 (commit)
via a171181a4c1a39954a0868c2f77973ef4f8a360e (commit)
via dd0e5937288e80df181f8200122bc940524e4aa1 (commit)
via 0ab57c63fc3d85db50b094a3e5f4ea1119872c9c (commit)
via 096f32b9b67d9f8a2e37a0d33cc2f96b61791523 (commit)
via 5795a1be8ce16dc1cb9540975ed15b4e16253619 (commit)
via 0c74ff70779acf8d9fec0a090efce210a378a07c (commit)
from f974f18a07c5e5c5a4ba5d6f3523da824e4c1e8e (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 8f8cea0a5359a4734f55ae13c18326f33db3912b
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 22:10:08 2011 +0100
doc: man pages for API functions were removed.
commit 89c3301101f3bc1b16351f0965436a4e0ecfc771
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 21:20:07 2011 +0100
Update gnulib files.
commit a171181a4c1a39954a0868c2f77973ef4f8a360e
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 21:18:21 2011 +0100
Improve syntax-check rules.
commit dd0e5937288e80df181f8200122bc940524e4aa1
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 21:14:03 2011 +0100
Re-indent.
commit 0ab57c63fc3d85db50b094a3e5f4ea1119872c9c
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 21:12:24 2011 +0100
Fix syntax-check whitespace nit.
commit 096f32b9b67d9f8a2e37a0d33cc2f96b61791523
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 21:09:54 2011 +0100
Fix portability quirk.
commit 5795a1be8ce16dc1cb9540975ed15b4e16253619
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 21:07:01 2011 +0100
Fix 'the the' double use.
commit 0c74ff70779acf8d9fec0a090efce210a378a07c
Author: Simon Josefsson <address@hidden>
Date: Tue Nov 8 21:05:43 2011 +0100
Remove unneeded assert.h inclusion.
-----------------------------------------------------------------------
Summary of changes:
GNUmakefile | 8 +-
NEWS | 7 +
cfg.mk | 16 +-
configure.ac | 2 +-
doc/Makefile.am | 2 +-
doc/manpages/Makefile.am | 706 +-----------------------------------
gl/Makefile.am | 39 ++-
gl/alignof.h | 53 ---
gl/argp-parse.c | 2 +-
gl/closedir.c | 4 +
gl/m4/gnulib-comp.m4 | 8 +-
gl/m4/math_h.m4 | 13 +-
gl/m4/stdalign.m4 | 22 ++
gl/math.in.h | 74 ++++
gl/stdalign.in.h | 89 +++++
gl/stdlib.in.h | 2 +-
gl/sys_socket.in.h | 2 +-
gl/tests/Makefile.am | 8 +
gl/tests/putenv.c | 2 +-
gl/tests/test-stdalign.c | 116 ++++++
lib/accelerated/x86/hmac-padlock.c | 1 -
maint.mk | 36 ++-
tests/Makefile.am | 16 +-
tests/rsa-md5-collision/README | 12 +-
24 files changed, 429 insertions(+), 811 deletions(-)
delete mode 100644 gl/alignof.h
create mode 100644 gl/m4/stdalign.m4
create mode 100644 gl/stdalign.in.h
create mode 100644 gl/tests/test-stdalign.c
diff --git a/GNUmakefile b/GNUmakefile
index 6e00ec8..86bc60f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -45,12 +45,13 @@ include Makefile
# Some projects override e.g., _autoreconf here.
-include $(srcdir)/cfg.mk
-include $(srcdir)/maint.mk
# Allow cfg.mk to override these.
_build-aux ?= build-aux
_autoreconf ?= autoreconf -v
+include $(srcdir)/maint.mk
+
# Ensure that $(VERSION) is up to date for dist-related targets, but not
# for others: rerunning autoreconf and recompiling everything isn't cheap.
_have-git-version-gen := \
@@ -100,6 +101,11 @@ srcdir = .
# The package can override .DEFAULT_GOAL to run actions like autoreconf.
-include ./cfg.mk
+
+# Allow cfg.mk to override these.
+_build-aux ?= build-aux
+_autoreconf ?= autoreconf -v
+
include ./maint.mk
ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
diff --git a/NEWS b/NEWS
index cd358b6..9f136bc 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GnuTLS NEWS -- History of user-visible changes.
-*- outline -*-
Copyright (C) 2000-2011 Free Software Foundation, Inc.
See the end for copying conditions.
+* Version 3.0.8 (unreleased)
+
+** doc: man pages for API functions were removed.
+The reason was that the code that auto-generated the man pages missed
+many APIs and we couldn't fix it (volunteers welcome). See the info
+manual or the GTK-DOC manual instead.
+
* Version 3.0.7 (released 2011-11-08)
** libgnutls: Corrected fix in gnutls_session_get_data()
diff --git a/cfg.mk b/cfg.mk
index 23c4131..02b5fcd 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -40,19 +40,17 @@ local-checks-to-skip = sc_GPL_version sc_bindtextdomain
\
sc_require_config_h_first sc_texinfo_acronym sc_trailing_blank \
sc_unmarked_diagnostics sc_useless_cpp_parens
-VC_LIST_ALWAYS_EXCLUDE_REGEX =
^maint.mk|(build-aux/|gl/|src/cfg/|tests/suite/ecore/|doc/protocol/).*
+VC_LIST_ALWAYS_EXCLUDE_REGEX =
^maint.mk|(build-aux/|gl/|src/cfg/|tests/suite/ecore/|doc/protocol/).*$$
# Explicit syntax-check exceptions.
-exclude_file_name_regexp--sc_cast_of_alloca_return_value = ^guile/
-exclude_file_name_regexp--sc_error_message_uppercase =
^doc/examples/ex-cxx.cpp|guile/src/extra.c|src/certtool.c|tests/pkcs12_encode.c
+exclude_file_name_regexp--sc_cast_of_alloca_return_value =
^guile/modules/gnutls/build/priorities.scm|guile/src/core.c$$
+exclude_file_name_regexp--sc_error_message_period = ^src/crywrap/crywrap.c$$
+exclude_file_name_regexp--sc_error_message_uppercase =
^doc/examples/ex-cxx.cpp|guile/src/core.c|src/certtool.c|src/crywrap/crywrap.c|tests/pkcs12_encode.c$$
exclude_file_name_regexp--sc_file_system = ^doc/doxygen/Doxyfile
-exclude_file_name_regexp--sc_prohibit_cvs_keyword = ^lib/nettle/
-exclude_file_name_regexp--sc_prohibit_doubled_word =
^tests/rsa-md5-collision/README$$
-exclude_file_name_regexp--sc_prohibit_undesirable_word_seq =
^tests/nist-pkits/gnutls-nist-tests.html
-exclude_file_name_regexp--sc_space_tab =
^doc/.*.(pdf|png)|tests/nist-pkits/|tests/suite/x509paths/
+exclude_file_name_regexp--sc_prohibit_cvs_keyword = ^lib/nettle/.*$$
+exclude_file_name_regexp--sc_prohibit_undesirable_word_seq =
^tests/nist-pkits/gnutls-nist-tests.html$$
+exclude_file_name_regexp--sc_space_tab =
^gtk-doc.make|doc/.*.(pdf|png)|tests/nist-pkits/|tests/suite/x509paths/.*$$
exclude_file_name_regexp--sc_two_space_separator_in_usage =
^doc/cha-programs.texi|tests/sha2/sha2|tests/sha2/sha2-dsa$$
-exclude_file_name_regexp--sc_error_message_period = ^src/crywrap/crywrap.c$$
-exclude_file_name_regexp--sc_error_message_uppercase =
^doc/examples/ex-cxx.cpp|guile/src/extra.c|src/certtool.c|src/crywrap/crywrap.c|tests/pkcs12_encode.c$$
autoreconf:
for f in $(PODIR)/*.po.in; do \
diff --git a/configure.ac b/configure.ac
index 65a947a..83d8820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,7 @@ fi
AM_CONDITIONAL(ASM_X86_64, test x"$hw_accel" = x"x86-64")
AM_CONDITIONAL(ASM_X86_32, test x"$hw_accel" = x"x86")
-AM_CONDITIONAL(ASM_X86, test x"$hw_accel" = x"x86" -o x"$hw_accel" = x"x86-64")
+AM_CONDITIONAL(ASM_X86, test x"$hw_accel" = x"x86" || test x"$hw_accel" =
x"x86-64")
AM_CONDITIONAL(HAVE_GCC_GNU89_INLINE_OPTION, test "$gnu89_inline" = "yes"])
AM_CONDITIONAL(HAVE_GCC, test "$GCC" = "yes")
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b99224b..f0e87e1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -38,7 +38,7 @@ gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi lgpl-2.1.texi
gpl-3.0.texi \
sec-tls-app.texi cha-errors.texi cha-support.texi
# Examples.
-gnutls_TEXINFOS += examples/ex-client1.c \
+gnutls_TEXINFOS += examples/ex-client1.c \
examples/ex-session-info.c examples/ex-verify.c \
examples/ex-cert-select.c examples/ex-client-resume.c \
examples/ex-client-srp.c examples/ex-rfc2818.c \
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 1525e88..081cb98 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -1,6 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2003-2011 Free Software Foundation, Inc.
#
# Author: Nikos Mavroyanopoulos, Simon Josefsson
#
@@ -26,706 +25,3 @@ dist_man_MANS = gnutls-cli.1 gnutls-cli-debug.1
gnutls-serv.1 \
if ENABLE_SRP
dist_man_MANS += srptool.1
endif
-
-APIMANS =
-APIMANS += gnutls_cipher_init.3
-APIMANS += gnutls_cipher_tag.3
-APIMANS += gnutls_cipher_add_auth.3
-APIMANS += gnutls_cipher_set_iv.3
-APIMANS += gnutls_cipher_encrypt.3
-APIMANS += gnutls_cipher_decrypt.3
-APIMANS += gnutls_cipher_encrypt2.3
-APIMANS += gnutls_cipher_decrypt2.3
-APIMANS += gnutls_cipher_deinit.3
-APIMANS += gnutls_hmac_init.3
-APIMANS += gnutls_hmac.3
-APIMANS += gnutls_hmac_output.3
-APIMANS += gnutls_hmac_deinit.3
-APIMANS += gnutls_hmac_get_len.3
-APIMANS += gnutls_hmac_fast.3
-APIMANS += gnutls_hash_init.3
-APIMANS += gnutls_hash.3
-APIMANS += gnutls_hash_output.3
-APIMANS += gnutls_hash_deinit.3
-APIMANS += gnutls_hash_get_len.3
-APIMANS += gnutls_hash_fast.3
-APIMANS += gnutls_key_generate.3
-APIMANS += gnutls_alert_get_name.3
-APIMANS += gnutls_alert_get_strname.3
-APIMANS += gnutls_alert_send.3
-APIMANS += gnutls_error_to_alert.3
-APIMANS += gnutls_alert_send_appropriate.3
-APIMANS += gnutls_alert_get.3
-APIMANS += gnutls_anon_free_server_credentials.3
-APIMANS += gnutls_anon_allocate_server_credentials.3
-APIMANS += gnutls_anon_free_client_credentials.3
-APIMANS += gnutls_anon_allocate_client_credentials.3
-APIMANS += gnutls_anon_set_server_dh_params.3
-APIMANS += gnutls_anon_set_server_params_function.3
-APIMANS += gnutls_credentials_clear.3
-APIMANS += gnutls_credentials_set.3
-APIMANS += gnutls_auth_get_type.3
-APIMANS += gnutls_auth_server_get_type.3
-APIMANS += gnutls_auth_client_get_type.3
-APIMANS += gnutls_record_check_pending.3
-APIMANS += gnutls_certificate_free_keys.3
-APIMANS += gnutls_certificate_free_cas.3
-APIMANS += gnutls_certificate_get_issuer.3
-APIMANS += gnutls_certificate_free_ca_names.3
-APIMANS += gnutls_certificate_free_credentials.3
-APIMANS += gnutls_certificate_allocate_credentials.3
-APIMANS += gnutls_certificate_server_set_request.3
-APIMANS += gnutls_certificate_client_set_retrieve_function.3
-APIMANS += gnutls_certificate_server_set_retrieve_function.3
-APIMANS += gnutls_certificate_set_retrieve_function.3
-APIMANS += gnutls_certificate_set_retrieve_function2.3
-APIMANS += gnutls_certificate_set_verify_function.3
-APIMANS += gnutls_certificate_verify_peers2.3
-APIMANS += gnutls_certificate_expiration_time_peers.3
-APIMANS += gnutls_certificate_activation_time_peers.3
-APIMANS += gnutls_sign_callback_set.3
-APIMANS += gnutls_sign_callback_get.3
-APIMANS += gnutls_compression_get_name.3
-APIMANS += gnutls_compression_get_id.3
-APIMANS += gnutls_compression_list.3
-APIMANS += gnutls_db_set_retrieve_function.3
-APIMANS += gnutls_db_set_remove_function.3
-APIMANS += gnutls_db_set_store_function.3
-APIMANS += gnutls_db_set_ptr.3
-APIMANS += gnutls_db_get_ptr.3
-APIMANS += gnutls_db_set_cache_expiration.3
-APIMANS += gnutls_db_check_entry.3
-APIMANS += gnutls_db_remove_session.3
-APIMANS += gnutls_dh_params_import_raw.3
-APIMANS += gnutls_dh_params_init.3
-APIMANS += gnutls_dh_params_deinit.3
-APIMANS += gnutls_dh_params_cpy.3
-APIMANS += gnutls_dh_params_generate2.3
-APIMANS += gnutls_dh_params_import_pkcs3.3
-APIMANS += gnutls_dh_params_export_pkcs3.3
-APIMANS += gnutls_dh_params_export_raw.3
-APIMANS += gnutls_dtls_set_timeouts.3
-APIMANS += gnutls_dtls_set_mtu.3
-APIMANS += gnutls_dtls_get_data_mtu.3
-APIMANS += gnutls_dtls_get_mtu.3
-APIMANS += gnutls_dtls_cookie_send.3
-APIMANS += gnutls_dtls_cookie_verify.3
-APIMANS += gnutls_dtls_prestate_set.3
-APIMANS += gnutls_record_get_discarded.3
-APIMANS += gnutls_error_is_fatal.3
-APIMANS += gnutls_perror.3
-APIMANS += gnutls_strerror.3
-APIMANS += gnutls_strerror_name.3
-APIMANS += gnutls_global_set_log_function.3
-APIMANS += gnutls_global_set_audit_log_function.3
-APIMANS += gnutls_global_set_time_function.3
-APIMANS += gnutls_global_set_log_level.3
-APIMANS += gnutls_global_set_mem_functions.3
-APIMANS += gnutls_global_init.3
-APIMANS += gnutls_global_deinit.3
-APIMANS += gnutls_check_version.3
-APIMANS += gnutls_rehandshake.3
-APIMANS += gnutls_handshake.3
-APIMANS += gnutls_handshake_set_max_packet_length.3
-APIMANS += gnutls_handshake_get_last_in.3
-APIMANS += gnutls_handshake_get_last_out.3
-APIMANS += gnutls_malloc.3
-APIMANS += gnutls_free.3
-APIMANS += gnutls_pcert_import_x509.3
-APIMANS += gnutls_pcert_list_import_x509_raw.3
-APIMANS += gnutls_pcert_import_x509_raw.3
-APIMANS += gnutls_pcert_import_openpgp.3
-APIMANS += gnutls_pcert_import_openpgp_raw.3
-APIMANS += gnutls_pcert_deinit.3
-APIMANS += gnutls_cipher_set_priority.3
-APIMANS += gnutls_kx_set_priority.3
-APIMANS += gnutls_mac_set_priority.3
-APIMANS += gnutls_compression_set_priority.3
-APIMANS += gnutls_protocol_set_priority.3
-APIMANS += gnutls_certificate_type_set_priority.3
-APIMANS += gnutls_priority_set.3
-APIMANS += gnutls_priority_init.3
-APIMANS += gnutls_priority_deinit.3
-APIMANS += gnutls_priority_set_direct.3
-APIMANS += gnutls_set_default_priority.3
-APIMANS += gnutls_set_default_export_priority.3
-APIMANS += gnutls_privkey_get_type.3
-APIMANS += gnutls_privkey_get_pk_algorithm.3
-APIMANS += gnutls_privkey_init.3
-APIMANS += gnutls_privkey_deinit.3
-APIMANS += gnutls_privkey_import_pkcs11.3
-APIMANS += gnutls_privkey_import_ext.3
-APIMANS += gnutls_privkey_import_x509.3
-APIMANS += gnutls_privkey_import_openpgp.3
-APIMANS += gnutls_privkey_sign_data.3
-APIMANS += gnutls_privkey_sign_hash.3
-APIMANS += gnutls_privkey_decrypt_data.3
-APIMANS += gnutls_psk_free_client_credentials.3
-APIMANS += gnutls_psk_allocate_client_credentials.3
-APIMANS += gnutls_psk_set_client_credentials.3
-APIMANS += gnutls_psk_free_server_credentials.3
-APIMANS += gnutls_psk_allocate_server_credentials.3
-APIMANS += gnutls_psk_set_server_credentials_file.3
-APIMANS += gnutls_psk_set_server_credentials_hint.3
-APIMANS += gnutls_psk_set_server_credentials_function.3
-APIMANS += gnutls_psk_set_client_credentials_function.3
-APIMANS += gnutls_psk_server_get_username.3
-APIMANS += gnutls_psk_client_get_hint.3
-APIMANS += gnutls_hex_decode.3
-APIMANS += gnutls_hex_encode.3
-APIMANS += gnutls_psk_set_server_dh_params.3
-APIMANS += gnutls_psk_set_server_params_function.3
-APIMANS += gnutls_pubkey_get_pk_algorithm.3
-APIMANS += gnutls_pubkey_get_key_usage.3
-APIMANS += gnutls_pubkey_init.3
-APIMANS += gnutls_pubkey_deinit.3
-APIMANS += gnutls_pubkey_import_x509.3
-APIMANS += gnutls_pubkey_import_privkey.3
-APIMANS += gnutls_pubkey_get_preferred_hash_algorithm.3
-APIMANS += gnutls_pubkey_import_pkcs11.3
-APIMANS += gnutls_pubkey_import_openpgp.3
-APIMANS += gnutls_pubkey_get_openpgp_key_id.3
-APIMANS += gnutls_pubkey_export.3
-APIMANS += gnutls_pubkey_get_key_id.3
-APIMANS += gnutls_pubkey_get_pk_rsa_raw.3
-APIMANS += gnutls_pubkey_get_pk_dsa_raw.3
-APIMANS += gnutls_pubkey_get_pk_ecc_raw.3
-APIMANS += gnutls_pubkey_get_pk_ecc_x962.3
-APIMANS += gnutls_pubkey_import.3
-APIMANS += gnutls_x509_crt_set_pubkey.3
-APIMANS += gnutls_x509_crq_set_pubkey.3
-APIMANS += gnutls_pubkey_set_key_usage.3
-APIMANS += gnutls_pubkey_import_pkcs11_url.3
-APIMANS += gnutls_pubkey_import_rsa_raw.3
-APIMANS += gnutls_pubkey_import_ecc_raw.3
-APIMANS += gnutls_pubkey_import_ecc_x962.3
-APIMANS += gnutls_pubkey_import_dsa_raw.3
-APIMANS += gnutls_pubkey_verify_data.3
-APIMANS += gnutls_pubkey_verify_data2.3
-APIMANS += gnutls_pubkey_verify_hash.3
-APIMANS += gnutls_pubkey_get_verify_algorithm.3
-APIMANS += gnutls_protocol_get_version.3
-APIMANS += gnutls_record_disable_padding.3
-APIMANS += gnutls_transport_set_ptr.3
-APIMANS += gnutls_transport_set_ptr2.3
-APIMANS += gnutls_transport_get_ptr.3
-APIMANS += gnutls_transport_get_ptr2.3
-APIMANS += gnutls_bye.3
-APIMANS += gnutls_record_send.3
-APIMANS += gnutls_record_recv.3
-APIMANS += gnutls_record_recv_seq.3
-APIMANS += gnutls_rsa_params_import_raw.3
-APIMANS += gnutls_rsa_params_init.3
-APIMANS += gnutls_rsa_params_deinit.3
-APIMANS += gnutls_rsa_params_cpy.3
-APIMANS += gnutls_rsa_params_generate2.3
-APIMANS += gnutls_rsa_params_import_pkcs1.3
-APIMANS += gnutls_rsa_params_export_pkcs1.3
-APIMANS += gnutls_rsa_params_export_raw.3
-APIMANS += gnutls_session_get_data.3
-APIMANS += gnutls_session_get_data2.3
-APIMANS += gnutls_session_get_id.3
-APIMANS += gnutls_session_set_data.3
-APIMANS += gnutls_cipher_get.3
-APIMANS += gnutls_certificate_type_get.3
-APIMANS += gnutls_kx_get.3
-APIMANS += gnutls_mac_get.3
-APIMANS += gnutls_compression_get.3
-APIMANS += gnutls_init.3
-APIMANS += gnutls_deinit.3
-APIMANS += gnutls_openpgp_send_cert.3
-APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
-APIMANS += gnutls_handshake_set_private_extensions.3
-APIMANS += gnutls_prf_raw.3
-APIMANS += gnutls_prf.3
-APIMANS += gnutls_session_is_resumed.3
-APIMANS += gnutls_session_get_ptr.3
-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_ecc_curve_get.3
-APIMANS += gnutls_hex2bin.3
-APIMANS += gnutls_supplemental_get_name.3
-APIMANS += gnutls_dh_set_prime_bits.3
-APIMANS += gnutls_dh_get_group.3
-APIMANS += gnutls_dh_get_pubkey.3
-APIMANS += gnutls_rsa_export_get_pubkey.3
-APIMANS += gnutls_dh_get_secret_bits.3
-APIMANS += gnutls_dh_get_prime_bits.3
-APIMANS += gnutls_rsa_export_get_modulus_bits.3
-APIMANS += gnutls_dh_get_peers_public_bits.3
-APIMANS += gnutls_certificate_get_ours.3
-APIMANS += gnutls_certificate_get_peers.3
-APIMANS += gnutls_certificate_client_get_request_status.3
-APIMANS += gnutls_fingerprint.3
-APIMANS += gnutls_certificate_set_dh_params.3
-APIMANS += gnutls_certificate_set_params_function.3
-APIMANS += gnutls_certificate_set_verify_flags.3
-APIMANS += gnutls_certificate_set_verify_limits.3
-APIMANS += gnutls_certificate_set_rsa_export_params.3
-APIMANS += gnutls_psk_set_params_function.3
-APIMANS += gnutls_anon_set_params_function.3
-APIMANS += gnutls_certificate_set_x509_key_mem.3
-APIMANS += gnutls_certificate_set_x509_key.3
-APIMANS += gnutls_certificate_set_key.3
-APIMANS += gnutls_certificate_set_x509_key_file.3
-APIMANS += gnutls_certificate_set_x509_trust_mem.3
-APIMANS += gnutls_certificate_set_x509_trust.3
-APIMANS += gnutls_certificate_set_x509_trust_file.3
-APIMANS += gnutls_certificate_set_x509_crl_mem.3
-APIMANS += gnutls_certificate_set_x509_crl.3
-APIMANS += gnutls_certificate_set_x509_crl_file.3
-APIMANS += gnutls_certificate_set_x509_simple_pkcs12_file.3
-APIMANS += gnutls_certificate_set_x509_simple_pkcs12_mem.3
-APIMANS += gnutls_certificate_free_crls.3
-APIMANS += gnutls_global_set_mutex.3
-APIMANS += gnutls_pkcs11_add_provider.3
-APIMANS += gnutls_pkcs11_obj_get_info.3
-APIMANS += gnutls_pkcs11_init.3
-APIMANS += gnutls_pkcs11_deinit.3
-APIMANS += gnutls_pkcs11_set_pin_function.3
-APIMANS += gnutls_pkcs11_set_token_function.3
-APIMANS += gnutls_pkcs11_obj_init.3
-APIMANS += gnutls_pkcs11_obj_deinit.3
-APIMANS += gnutls_pkcs11_obj_export.3
-APIMANS += gnutls_pkcs11_obj_import_url.3
-APIMANS += gnutls_pkcs11_token_get_url.3
-APIMANS += gnutls_pkcs11_token_get_info.3
-APIMANS += gnutls_pkcs11_obj_export_url.3
-APIMANS += gnutls_pkcs11_obj_get_type.3
-APIMANS += gnutls_pkcs11_obj_list_import_url.3
-APIMANS += gnutls_x509_crt_import_pkcs11_url.3
-APIMANS += gnutls_x509_crt_import_pkcs11.3
-APIMANS += gnutls_x509_crt_list_import_pkcs11.3
-APIMANS += gnutls_pkcs11_token_get_flags.3
-APIMANS += gnutls_pkcs11_token_get_mechanism.3
-APIMANS += gnutls_pkcs11_type_get_name.3
-APIMANS += gnutls_pkcs11_privkey_init.3
-APIMANS += gnutls_pkcs11_privkey_deinit.3
-APIMANS += gnutls_pkcs11_privkey_get_pk_algorithm.3
-APIMANS += gnutls_pkcs11_privkey_get_info.3
-APIMANS += gnutls_pkcs11_privkey_import_url.3
-APIMANS += gnutls_pkcs11_privkey_export_url.3
-APIMANS += gnutls_pkcs11_privkey_generate.3
-APIMANS += gnutls_pkcs11_copy_secret_key.3
-APIMANS += gnutls_pkcs11_copy_x509_crt.3
-APIMANS += gnutls_pkcs11_copy_x509_privkey.3
-APIMANS += gnutls_pkcs11_delete_url.3
-APIMANS += gnutls_pkcs11_token_init.3
-APIMANS += gnutls_pkcs11_token_set_pin.3
-APIMANS += gnutls_rnd.3
-APIMANS += gnutls_transport_set_errno.3
-APIMANS += gnutls_transport_set_pull_function.3
-APIMANS += gnutls_transport_set_pull_timeout_function.3
-APIMANS += gnutls_transport_set_push_function.3
-APIMANS += gnutls_transport_set_vec_push_function.3
-APIMANS += gnutls_transport_set_errno_function.3
-APIMANS += gnutls_pem_base64_encode.3
-APIMANS += gnutls_pem_base64_encode_alloc.3
-APIMANS += gnutls_pem_base64_decode.3
-APIMANS += gnutls_pem_base64_decode_alloc.3
-APIMANS += gnutls_x509_dn_oid_known.3
-APIMANS += gnutls_x509_crl_init.3
-APIMANS += gnutls_x509_crl_deinit.3
-APIMANS += gnutls_x509_crl_import.3
-APIMANS += gnutls_x509_crl_get_issuer_dn.3
-APIMANS += gnutls_x509_crl_get_issuer_dn_by_oid.3
-APIMANS += gnutls_x509_crl_get_dn_oid.3
-APIMANS += gnutls_x509_crl_get_signature_algorithm.3
-APIMANS += gnutls_x509_crl_get_signature.3
-APIMANS += gnutls_x509_crl_get_version.3
-APIMANS += gnutls_x509_crl_get_this_update.3
-APIMANS += gnutls_x509_crl_get_next_update.3
-APIMANS += gnutls_x509_crl_get_crt_count.3
-APIMANS += gnutls_x509_crl_get_crt_serial.3
-APIMANS += gnutls_x509_crl_get_raw_issuer_dn.3
-APIMANS += gnutls_x509_crl_export.3
-APIMANS += gnutls_x509_crl_get_authority_key_id.3
-APIMANS += gnutls_x509_crl_get_number.3
-APIMANS += gnutls_x509_crl_get_extension_oid.3
-APIMANS += gnutls_x509_crl_get_extension_info.3
-APIMANS += gnutls_x509_crl_get_extension_data.3
-APIMANS += gnutls_x509_crl_list_import2.3
-APIMANS += gnutls_x509_crl_list_import.3
-APIMANS += gnutls_x509_crl_set_version.3
-APIMANS += gnutls_x509_crl_sign2.3
-APIMANS += gnutls_x509_crl_sign.3
-APIMANS += gnutls_x509_crl_set_this_update.3
-APIMANS += gnutls_x509_crl_set_next_update.3
-APIMANS += gnutls_x509_crl_set_crt_serial.3
-APIMANS += gnutls_x509_crl_set_crt.3
-APIMANS += gnutls_x509_crl_set_authority_key_id.3
-APIMANS += gnutls_x509_crl_set_number.3
-APIMANS += gnutls_x509_crl_privkey_sign.3
-APIMANS += gnutls_x509_crq_init.3
-APIMANS += gnutls_x509_crq_deinit.3
-APIMANS += gnutls_x509_crq_import.3
-APIMANS += gnutls_x509_crq_get_dn.3
-APIMANS += gnutls_x509_crq_get_dn_by_oid.3
-APIMANS += gnutls_x509_crq_get_dn_oid.3
-APIMANS += gnutls_x509_crq_get_challenge_password.3
-APIMANS += gnutls_x509_crq_set_attribute_by_oid.3
-APIMANS += gnutls_x509_crq_get_attribute_by_oid.3
-APIMANS += gnutls_x509_crq_set_dn_by_oid.3
-APIMANS += gnutls_x509_crq_set_version.3
-APIMANS += gnutls_x509_crq_get_version.3
-APIMANS += gnutls_x509_crq_set_key.3
-APIMANS += gnutls_x509_crq_get_key_rsa_raw.3
-APIMANS += gnutls_x509_crq_set_key_rsa_raw.3
-APIMANS += gnutls_x509_crq_set_challenge_password.3
-APIMANS += gnutls_x509_crq_sign2.3
-APIMANS += gnutls_x509_crq_sign.3
-APIMANS += gnutls_x509_crq_export.3
-APIMANS += gnutls_x509_crq_get_pk_algorithm.3
-APIMANS += gnutls_x509_crq_get_attribute_info.3
-APIMANS += gnutls_x509_crq_get_attribute_data.3
-APIMANS += gnutls_x509_crq_get_extension_info.3
-APIMANS += gnutls_x509_crq_get_extension_data.3
-APIMANS += gnutls_x509_crq_get_key_usage.3
-APIMANS += gnutls_x509_crq_get_basic_constraints.3
-APIMANS += gnutls_x509_crq_get_subject_alt_name.3
-APIMANS += gnutls_x509_crq_get_subject_alt_othername_oid.3
-APIMANS += gnutls_x509_crq_get_extension_by_oid.3
-APIMANS += gnutls_x509_crq_set_subject_alt_name.3
-APIMANS += gnutls_x509_crq_set_basic_constraints.3
-APIMANS += gnutls_x509_crq_set_key_usage.3
-APIMANS += gnutls_x509_crq_get_key_purpose_oid.3
-APIMANS += gnutls_x509_crq_set_key_purpose_oid.3
-APIMANS += gnutls_x509_crq_get_key_id.3
-APIMANS += gnutls_x509_crq_privkey_sign.3
-APIMANS += gnutls_x509_crq_verify.3
-APIMANS += gnutls_x509_dn_init.3
-APIMANS += gnutls_x509_dn_import.3
-APIMANS += gnutls_x509_dn_deinit.3
-APIMANS += gnutls_x509_rdn_get.3
-APIMANS += gnutls_x509_rdn_get_by_oid.3
-APIMANS += gnutls_x509_rdn_get_oid.3
-APIMANS += gnutls_x509_dn_export.3
-APIMANS += gnutls_x509_crt_print.3
-APIMANS += gnutls_x509_crl_print.3
-APIMANS += gnutls_x509_crq_print.3
-APIMANS += gnutls_pkcs12_init.3
-APIMANS += gnutls_pkcs12_deinit.3
-APIMANS += gnutls_pkcs12_import.3
-APIMANS += gnutls_pkcs12_export.3
-APIMANS += gnutls_pkcs12_get_bag.3
-APIMANS += gnutls_pkcs12_set_bag.3
-APIMANS += gnutls_pkcs12_generate_mac.3
-APIMANS += gnutls_pkcs12_verify_mac.3
-APIMANS += gnutls_pkcs12_bag_init.3
-APIMANS += gnutls_pkcs12_bag_deinit.3
-APIMANS += gnutls_pkcs12_bag_get_type.3
-APIMANS += gnutls_pkcs12_bag_get_count.3
-APIMANS += gnutls_pkcs12_bag_get_data.3
-APIMANS += gnutls_pkcs12_bag_set_data.3
-APIMANS += gnutls_pkcs12_bag_set_crt.3
-APIMANS += gnutls_pkcs12_bag_set_crl.3
-APIMANS += gnutls_pkcs12_bag_set_key_id.3
-APIMANS += gnutls_pkcs12_bag_get_key_id.3
-APIMANS += gnutls_pkcs12_bag_get_friendly_name.3
-APIMANS += gnutls_pkcs12_bag_set_friendly_name.3
-APIMANS += gnutls_pkcs12_bag_decrypt.3
-APIMANS += gnutls_pkcs12_bag_encrypt.3
-APIMANS += gnutls_pkcs7_init.3
-APIMANS += gnutls_pkcs7_deinit.3
-APIMANS += gnutls_pkcs7_import.3
-APIMANS += gnutls_pkcs7_get_crt_raw.3
-APIMANS += gnutls_pkcs7_get_crt_count.3
-APIMANS += gnutls_pkcs7_export.3
-APIMANS += gnutls_pkcs7_set_crt_raw.3
-APIMANS += gnutls_pkcs7_set_crt.3
-APIMANS += gnutls_pkcs7_delete_crt.3
-APIMANS += gnutls_pkcs7_get_crl_raw.3
-APIMANS += gnutls_pkcs7_get_crl_count.3
-APIMANS += gnutls_pkcs7_set_crl_raw.3
-APIMANS += gnutls_pkcs7_set_crl.3
-APIMANS += gnutls_pkcs7_delete_crl.3
-APIMANS += gnutls_x509_privkey_init.3
-APIMANS += gnutls_x509_privkey_deinit.3
-APIMANS += gnutls_x509_privkey_cpy.3
-APIMANS += gnutls_x509_privkey_import.3
-APIMANS += gnutls_x509_privkey_import_rsa_raw.3
-APIMANS += gnutls_x509_privkey_import_rsa_raw2.3
-APIMANS += gnutls_x509_privkey_import_dsa_raw.3
-APIMANS += gnutls_x509_privkey_import_ecc_raw.3
-APIMANS += gnutls_x509_privkey_get_pk_algorithm.3
-APIMANS += gnutls_x509_privkey_export.3
-APIMANS += gnutls_x509_privkey_sec_param.3
-APIMANS += gnutls_x509_privkey_export_ecc_raw.3
-APIMANS += gnutls_x509_privkey_export_rsa_raw.3
-APIMANS += gnutls_x509_privkey_export_rsa_raw2.3
-APIMANS += gnutls_x509_privkey_export_dsa_raw.3
-APIMANS += gnutls_x509_privkey_generate.3
-APIMANS += gnutls_x509_privkey_get_key_id.3
-APIMANS += gnutls_x509_privkey_sign_hash.3
-APIMANS += gnutls_x509_privkey_sign_data.3
-APIMANS += gnutls_x509_privkey_fix.3
-APIMANS += gnutls_x509_privkey_export_pkcs8.3
-APIMANS += gnutls_x509_privkey_import_pkcs8.3
-APIMANS += gnutls_x509_crt_check_hostname.3
-APIMANS += gnutls_x509_trust_list_init.3
-APIMANS += gnutls_x509_trust_list_deinit.3
-APIMANS += gnutls_x509_trust_list_add_cas.3
-APIMANS += gnutls_x509_trust_list_add_named_crt.3
-APIMANS += gnutls_x509_trust_list_add_crls.3
-APIMANS += gnutls_x509_trust_list_get_issuer.3
-APIMANS += gnutls_x509_trust_list_verify_crt.3
-APIMANS += gnutls_x509_trust_list_verify_named_crt.3
-APIMANS += gnutls_x509_crt_check_issuer.3
-APIMANS += gnutls_x509_crt_list_verify.3
-APIMANS += gnutls_x509_crt_verify.3
-APIMANS += gnutls_x509_crl_check_issuer.3
-APIMANS += gnutls_x509_crl_verify.3
-APIMANS += gnutls_x509_crt_init.3
-APIMANS += gnutls_x509_crt_deinit.3
-APIMANS += gnutls_x509_crt_import.3
-APIMANS += gnutls_x509_crt_get_issuer_dn.3
-APIMANS += gnutls_x509_crt_get_issuer_dn_by_oid.3
-APIMANS += gnutls_x509_crt_get_issuer_dn_oid.3
-APIMANS += gnutls_x509_crt_get_dn.3
-APIMANS += gnutls_x509_crt_get_dn_by_oid.3
-APIMANS += gnutls_x509_crt_get_dn_oid.3
-APIMANS += gnutls_x509_crt_get_signature_algorithm.3
-APIMANS += gnutls_x509_crt_get_signature.3
-APIMANS += gnutls_x509_crt_get_version.3
-APIMANS += gnutls_x509_crt_get_activation_time.3
-APIMANS += gnutls_x509_crt_get_expiration_time.3
-APIMANS += gnutls_x509_crt_get_serial.3
-APIMANS += gnutls_x509_crt_get_subject_key_id.3
-APIMANS += gnutls_x509_crt_get_authority_key_id.3
-APIMANS += gnutls_x509_crt_get_pk_algorithm.3
-APIMANS += gnutls_x509_crt_get_subject_alt_name.3
-APIMANS += gnutls_x509_crt_get_issuer_alt_name.3
-APIMANS += gnutls_x509_crt_get_subject_alt_name2.3
-APIMANS += gnutls_x509_crt_get_issuer_alt_name2.3
-APIMANS += gnutls_x509_crt_get_subject_alt_othername_oid.3
-APIMANS += gnutls_x509_crt_get_issuer_alt_othername_oid.3
-APIMANS += gnutls_x509_crt_get_basic_constraints.3
-APIMANS += gnutls_x509_crt_get_ca_status.3
-APIMANS += gnutls_x509_crt_get_key_usage.3
-APIMANS += gnutls_x509_crt_get_proxy.3
-APIMANS += gnutls_x509_crt_get_extension_by_oid.3
-APIMANS += gnutls_x509_crt_get_extension_oid.3
-APIMANS += gnutls_x509_crt_get_extension_info.3
-APIMANS += gnutls_x509_crt_get_extension_data.3
-APIMANS += gnutls_x509_crt_get_raw_issuer_dn.3
-APIMANS += gnutls_x509_crt_get_raw_dn.3
-APIMANS += gnutls_x509_crt_get_subject.3
-APIMANS += gnutls_x509_crt_get_issuer.3
-APIMANS += gnutls_x509_dn_get_rdn_ava.3
-APIMANS += gnutls_x509_crt_get_fingerprint.3
-APIMANS += gnutls_x509_crt_export.3
-APIMANS += gnutls_x509_crt_get_key_id.3
-APIMANS += gnutls_x509_crt_check_revocation.3
-APIMANS += gnutls_x509_crt_get_verify_algorithm.3
-APIMANS += gnutls_x509_crt_get_preferred_hash_algorithm.3
-APIMANS += gnutls_x509_crt_verify_data.3
-APIMANS += gnutls_x509_crt_verify_hash.3
-APIMANS += gnutls_x509_crt_get_crl_dist_points.3
-APIMANS += gnutls_x509_crt_get_key_purpose_oid.3
-APIMANS += gnutls_x509_crt_get_pk_rsa_raw.3
-APIMANS += gnutls_x509_crt_get_pk_dsa_raw.3
-APIMANS += gnutls_x509_crt_list_import2.3
-APIMANS += gnutls_x509_crt_list_import.3
-APIMANS += gnutls_x509_crt_get_subject_unique_id.3
-APIMANS += gnutls_x509_crt_get_issuer_unique_id.3
-APIMANS += gnutls_x509_crt_get_authority_info_access.3
-APIMANS += gnutls_x509_crt_set_dn_by_oid.3
-APIMANS += gnutls_x509_crt_set_issuer_dn_by_oid.3
-APIMANS += gnutls_x509_crt_set_proxy_dn.3
-APIMANS += gnutls_x509_crt_set_version.3
-APIMANS += gnutls_x509_crt_set_key.3
-APIMANS += gnutls_x509_crt_set_crq.3
-APIMANS += gnutls_x509_crt_set_crq_extensions.3
-APIMANS += gnutls_x509_crt_set_extension_by_oid.3
-APIMANS += gnutls_x509_crt_set_basic_constraints.3
-APIMANS += gnutls_x509_crt_set_ca_status.3
-APIMANS += gnutls_x509_crt_set_key_usage.3
-APIMANS += gnutls_x509_crt_set_subject_alternative_name.3
-APIMANS += gnutls_x509_crt_set_subject_alt_name.3
-APIMANS += gnutls_x509_crt_set_proxy.3
-APIMANS += gnutls_x509_crt_sign2.3
-APIMANS += gnutls_x509_crt_sign.3
-APIMANS += gnutls_x509_crt_set_activation_time.3
-APIMANS += gnutls_x509_crt_set_expiration_time.3
-APIMANS += gnutls_x509_crt_set_serial.3
-APIMANS += gnutls_x509_crt_set_crl_dist_points.3
-APIMANS += gnutls_x509_crt_set_crl_dist_points2.3
-APIMANS += gnutls_x509_crt_cpy_crl_dist_points.3
-APIMANS += gnutls_x509_crt_set_subject_key_id.3
-APIMANS += gnutls_x509_crt_set_authority_key_id.3
-APIMANS += gnutls_x509_crt_set_key_purpose_oid.3
-APIMANS += gnutls_x509_crt_privkey_sign.3
-APIMANS += gnutls_openpgp_keyring_init.3
-APIMANS += gnutls_openpgp_keyring_deinit.3
-APIMANS += gnutls_openpgp_keyring_check_id.3
-APIMANS += gnutls_openpgp_keyring_import.3
-APIMANS += gnutls_openpgp_keyring_get_crt_count.3
-APIMANS += gnutls_openpgp_keyring_get_crt.3
-APIMANS += gnutls_certificate_set_openpgp_key.3
-APIMANS += gnutls_certificate_set_openpgp_key_mem.3
-APIMANS += gnutls_certificate_set_openpgp_key_file.3
-APIMANS += gnutls_certificate_set_openpgp_key_mem2.3
-APIMANS += gnutls_certificate_set_openpgp_key_file2.3
-APIMANS += gnutls_certificate_set_openpgp_keyring_file.3
-APIMANS += gnutls_certificate_set_openpgp_keyring_mem.3
-APIMANS += gnutls_openpgp_set_recv_key_function.3
-APIMANS += gnutls_openpgp_crt_print.3
-APIMANS += gnutls_openpgp_crt_init.3
-APIMANS += gnutls_openpgp_crt_deinit.3
-APIMANS += gnutls_openpgp_crt_import.3
-APIMANS += gnutls_openpgp_crt_export.3
-APIMANS += gnutls_openpgp_crt_get_fingerprint.3
-APIMANS += gnutls_openpgp_crt_get_name.3
-APIMANS += gnutls_openpgp_crt_get_pk_algorithm.3
-APIMANS += gnutls_openpgp_crt_get_version.3
-APIMANS += gnutls_openpgp_crt_get_creation_time.3
-APIMANS += gnutls_openpgp_crt_get_expiration_time.3
-APIMANS += gnutls_openpgp_crt_get_key_id.3
-APIMANS += gnutls_openpgp_crt_get_revoked_status.3
-APIMANS += gnutls_openpgp_crt_check_hostname.3
-APIMANS += gnutls_openpgp_crt_get_key_usage.3
-APIMANS += gnutls_openpgp_crt_get_subkey_count.3
-APIMANS += gnutls_openpgp_crt_get_subkey_revoked_status.3
-APIMANS += gnutls_openpgp_crt_get_subkey_pk_algorithm.3
-APIMANS += gnutls_openpgp_crt_get_subkey_creation_time.3
-APIMANS += gnutls_openpgp_crt_get_subkey_expiration_time.3
-APIMANS += gnutls_openpgp_crt_get_subkey_id.3
-APIMANS += gnutls_openpgp_crt_get_subkey_fingerprint.3
-APIMANS += gnutls_openpgp_crt_get_subkey_idx.3
-APIMANS += gnutls_openpgp_crt_get_subkey_usage.3
-APIMANS += gnutls_openpgp_crt_get_pk_rsa_raw.3
-APIMANS += gnutls_openpgp_crt_get_pk_dsa_raw.3
-APIMANS += gnutls_openpgp_crt_get_subkey_pk_rsa_raw.3
-APIMANS += gnutls_openpgp_crt_get_subkey_pk_dsa_raw.3
-APIMANS += gnutls_openpgp_crt_get_preferred_key_id.3
-APIMANS += gnutls_openpgp_crt_set_preferred_key_id.3
-APIMANS += gnutls_openpgp_crt_get_auth_subkey.3
-APIMANS += gnutls_openpgp_crt_verify_ring.3
-APIMANS += gnutls_openpgp_crt_verify_self.3
-APIMANS += gnutls_openpgp_privkey_init.3
-APIMANS += gnutls_openpgp_privkey_deinit.3
-APIMANS += gnutls_openpgp_privkey_sec_param.3
-APIMANS += gnutls_openpgp_privkey_import.3
-APIMANS += gnutls_openpgp_privkey_export.3
-APIMANS += gnutls_openpgp_privkey_get_pk_algorithm.3
-APIMANS += gnutls_openpgp_privkey_get_revoked_status.3
-APIMANS += gnutls_openpgp_privkey_get_fingerprint.3
-APIMANS += gnutls_openpgp_privkey_get_key_id.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_count.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_revoked_status.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_pk_algorithm.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_idx.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_creation_time.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_expiration_time.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_id.3
-APIMANS += gnutls_openpgp_privkey_get_subkey_fingerprint.3
-APIMANS += gnutls_openpgp_privkey_export_rsa_raw.3
-APIMANS += gnutls_openpgp_privkey_export_dsa_raw.3
-APIMANS += gnutls_openpgp_privkey_export_subkey_rsa_raw.3
-APIMANS += gnutls_openpgp_privkey_export_subkey_dsa_raw.3
-APIMANS += gnutls_openpgp_privkey_get_preferred_key_id.3
-APIMANS += gnutls_openpgp_privkey_set_preferred_key_id.3
-APIMANS += gnutls_openpgp_privkey_sign_hash.3
-
-SRPMANS =
-SRPMANS += gnutls_srp_free_client_credentials.3
-SRPMANS += gnutls_srp_allocate_client_credentials.3
-SRPMANS += gnutls_srp_set_client_credentials.3
-SRPMANS += gnutls_srp_free_server_credentials.3
-SRPMANS += gnutls_srp_allocate_server_credentials.3
-SRPMANS += gnutls_srp_set_server_credentials_file.3
-SRPMANS += gnutls_srp_set_server_credentials_function.3
-SRPMANS += gnutls_srp_set_client_credentials_function.3
-SRPMANS += gnutls_srp_server_get_username.3
-SRPMANS += gnutls_srp_verifier.3
-SRPMANS += gnutls_srp_set_prime_bits.3
-
-dist_man_MANS += $(APIMANS)
-if ENABLE_SRP
-dist_man_MANS += $(SRPMANS)
-endif
-
-$(APIMANS) $(SRPMANS):
- make update-makefile
- make Makefile
- make doit
-
-update-makefile:
- FUNCS=`$(top_srcdir)/doc/scripts/gdoc -listfunc \
- $(top_srcdir)/{lib,lib/x509,lib/openpgp}/*.c`; \
- MANS=""; \
- SRPMANS=""; \
- for i in $$FUNCS; do \
- if echo $$i | grep gnutls_srp_ > /dev/null; then \
- SRPMANS="$$SRPMANS\nSRPMANS += $$i.3"; \
- else \
- MANS="$$MANS\nAPIMANS += $$i.3"; \
- fi \
- done; \
- grep -v -e '^APIMANS += ' -e '^SRPMANS += ' Makefile.am | \
- perl -p -e "s/^APIMANS =/APIMANS =$$MANS/" | \
- perl -p -e "s/^SRPMANS =/SRPMANS =$$SRPMANS/" > foo; \
- mv foo Makefile.am
-
-doit:
- @echo -n "Creating man pages for lib/" && \
- for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc
$(top_srcdir)/lib/*.c`; do \
- $(top_srcdir)/doc/scripts/gdoc -man \
- -module $(PACKAGE) -sourceversion $(VERSION) \
- -bugsto $(PACKAGE_BUGREPORT) \
- -pkg-name "$(PACKAGE_NAME)" \
- -include "gnutls/gnutls.h" \
- -seeinfo $(PACKAGE) -verbatimcopying \
- -copyright "2008 Free Software Foundation" \
- -function $$i \
- $(top_srcdir)/lib/*.c > $$i.3 && \
- echo -n "."; \
- done; \
- echo ""; \
- echo -n "Creating man pages for lib/x509/" && \
- for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc
$(top_srcdir)/lib/x509/*.c | grep -v gnutls_pkcs12`; do \
- $(top_srcdir)/doc/scripts/gdoc -man \
- -module $(PACKAGE) -sourceversion $(VERSION) \
- -bugsto $(PACKAGE_BUGREPORT) \
- -pkg-name "$(PACKAGE_NAME)" \
- -include "gnutls/x509.h" \
- -seeinfo $(PACKAGE) -verbatimcopying \
- -copyright "2008 Free Software Foundation" \
- -function $$i \
- $(top_srcdir)/lib/x509/*.c > $$i.3 && \
- echo -n "."; \
- done; \
- echo ""; \
- echo -n "Creating man pages for lib/x509/ (pkcs12)" && \
- for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc
$(top_srcdir)/lib/x509/*.c | grep gnutls_pkcs12`; do \
- $(top_srcdir)/doc/scripts/gdoc -man \
- -module $(PACKAGE) -sourceversion $(VERSION) \
- -bugsto $(PACKAGE_BUGREPORT) \
- -pkg-name "$(PACKAGE_NAME)" \
- -include "gnutls/pkcs12.h" \
- -seeinfo $(PACKAGE) -verbatimcopying \
- -copyright "2008 Free Software Foundation" \
- -function $$i \
- $(top_srcdir)/lib/x509/*.c > $$i.3 && \
- echo -n "."; \
- done; \
- echo ""; \
- echo -n "Creating man pages for lib/openpgp/" && \
- for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc
$(top_srcdir)/lib/openpgp/*.c`; do \
- $(top_srcdir)/doc/scripts/gdoc -man \
- -module $(PACKAGE) -sourceversion $(VERSION) \
- -bugsto $(PACKAGE_BUGREPORT) \
- -pkg-name "$(PACKAGE_NAME)" \
- -include "gnutls/openpgp.h" \
- -seeinfo $(PACKAGE) -verbatimcopying \
- -copyright "2008 Free Software Foundation" \
- -function $$i \
- $(top_srcdir)/lib/openpgp/*.c > $$i.3 && \
- echo -n "."; \
- done; \
- echo ""
-
-.PHONY: update-makefile doit
diff --git a/gl/Makefile.am b/gl/Makefile.am
index a4548c1..320b2c0 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -67,13 +67,6 @@ EXTRA_libgnu_la_SOURCES += accept.c
## end gnulib module accept
-## begin gnulib module alignof
-
-
-EXTRA_DIST += alignof.h
-
-## end gnulib module alignof
-
## begin gnulib module alloca
@@ -713,6 +706,9 @@ math.h: math.in.h $(top_builddir)/config.status
$(CXXDEFS_H) $(ARG_NONNULL_H) $(
-e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \
-e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \
-e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \
+ -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \
+ -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \
+ -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \
-e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \
-e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \
-e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \
@@ -766,6 +762,9 @@ math.h: math.in.h $(top_builddir)/config.status
$(CXXDEFS_H) $(ARG_NONNULL_H) $(
-e 's|@''HAVE_EXPF''@|$(HAVE_EXPF)|g' \
-e 's|@''HAVE_EXPL''@|$(HAVE_EXPL)|g' \
-e 's|@''HAVE_FABSF''@|$(HAVE_FABSF)|g' \
+ -e 's|@''HAVE_FMA''@|$(HAVE_FMA)|g' \
+ -e 's|@''HAVE_FMAF''@|$(HAVE_FMAF)|g' \
+ -e 's|@''HAVE_FMAL''@|$(HAVE_FMAL)|g' \
-e 's|@''HAVE_FMODF''@|$(HAVE_FMODF)|g' \
-e 's|@''HAVE_FREXPF''@|$(HAVE_FREXPF)|g' \
-e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \
@@ -817,6 +816,9 @@ math.h: math.in.h $(top_builddir)/config.status
$(CXXDEFS_H) $(ARG_NONNULL_H) $(
-e 's|@''REPLACE_FLOOR''@|$(REPLACE_FLOOR)|g' \
-e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \
-e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \
+ -e 's|@''REPLACE_FMA''@|$(REPLACE_FMA)|g' \
+ -e 's|@''REPLACE_FMAF''@|$(REPLACE_FMAF)|g' \
+ -e 's|@''REPLACE_FMAL''@|$(REPLACE_FMAL)|g' \
-e 's|@''REPLACE_FREXPF''@|$(REPLACE_FREXPF)|g' \
-e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
-e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
@@ -1275,6 +1277,29 @@ EXTRA_DIST += w32sock.h
## end gnulib module sockets
+## begin gnulib module stdalign
+
+BUILT_SOURCES += $(STDALIGN_H)
+
+# We need the following in order to create <stdalign.h> when the system
+# doesn't have one that works.
+if GL_GENERATE_STDALIGN_H
+stdalign.h: stdalign.in.h $(top_builddir)/config.status
+ $(AM_V_GEN)rm -f address@hidden $@ && \
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+ cat $(srcdir)/stdalign.in.h; \
+ } > address@hidden && \
+ mv address@hidden $@
+else
+stdalign.h: $(top_builddir)/config.status
+ rm -f $@
+endif
+MOSTLYCLEANFILES += stdalign.h stdalign.h-t
+
+EXTRA_DIST += stdalign.in.h
+
+## end gnulib module stdalign
+
## begin gnulib module stdarg
BUILT_SOURCES += $(STDARG_H)
diff --git a/gl/alignof.h b/gl/alignof.h
deleted file mode 100644
index 1c1f75c..0000000
--- a/gl/alignof.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Determine alignment of types.
- Copyright (C) 2003-2004, 2006, 2009-2011 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
-#ifndef _ALIGNOF_H
-#define _ALIGNOF_H
-
-#include <stddef.h>
-
-/* Determine the alignment of a structure slot (field) of a given type,
- at compile time. Note that the result depends on the ABI.
- Note: The result cannot be used as a value for an 'enum' constant,
- due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc. */
-#if defined __cplusplus
- template <class type> struct alignof_helper { char __slot1; type __slot2; };
-# define alignof_slot(type) offsetof (alignof_helper<type>, __slot2)
-#else
-# define alignof_slot(type) offsetof (struct { char __slot1; type __slot2; },
__slot2)
-#endif
-
-/* Determine the good alignment of an object of the given type at compile time.
- Note that this is not necessarily the same as alignof_slot(type).
- For example, with GNU C on x86 platforms: alignof_type(double) = 8, but
- - when -malign-double is not specified: alignof_slot(double) = 4,
- - when -malign-double is specified: alignof_slot(double) = 8.
- Note: The result cannot be used as a value for an 'enum' constant,
- due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc. */
-#if defined __GNUC__
-# define alignof_type __alignof__
-#else
-# define alignof_type alignof_slot
-#endif
-
-/* alignof is an alias for alignof_slot semantics, since that's what most
- callers need.
- Note: The result cannot be used as a value for an 'enum' constant,
- due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc. */
-#define alignof alignof_slot
-
-#endif /* _ALIGNOF_H */
diff --git a/gl/argp-parse.c b/gl/argp-parse.c
index 5cab8ce..64360be 100644
--- a/gl/argp-parse.c
+++ b/gl/argp-parse.c
@@ -21,6 +21,7 @@
#endif
#include <alloca.h>
+#include <stdalign.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -42,7 +43,6 @@
#include "argp.h"
#include "argp-namefrob.h"
-#define alignof(type) offsetof (struct { char c; type x; }, x)
#define alignto(n, d) ((((n) + (d) - 1) / (d)) * (d))
/* Getopt return values. */
diff --git a/gl/closedir.c b/gl/closedir.c
index 700d60e..0fdce18 100644
--- a/gl/closedir.c
+++ b/gl/closedir.c
@@ -19,6 +19,10 @@
/* Specification. */
#include <dirent.h>
+#if REPLACE_FCHDIR
+# include <unistd.h>
+#endif
+
#if HAVE_CLOSEDIR
/* Override closedir(), to keep track of the open file descriptors.
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 9e8e355..75c46af 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -40,7 +40,6 @@ AC_DEFUN([gl_EARLY],
AC_REQUIRE([gl_PROG_AR_RANLIB])
# Code from module accept:
# Code from module accept-tests:
- # Code from module alignof:
# Code from module alloca:
# Code from module alloca-opt:
# Code from module alloca-opt-tests:
@@ -249,6 +248,8 @@ AC_DEFUN([gl_EARLY],
# Code from module ssize_t:
# Code from module stat:
# Code from module stat-tests:
+ # Code from module stdalign:
+ # Code from module stdalign-tests:
# Code from module stdarg:
dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
dnl for the builtin va_copy to work. With Autoconf 2.60 or later,
@@ -702,6 +703,7 @@ gl_SOCKETLIB
gl_SOCKETS
gl_TYPE_SOCKLEN_T
gt_TYPE_SSIZE_T
+gl_STDALIGN_H
gl_STDARG_H
AM_STDBOOL_H
gl_STDDEF_H
@@ -1081,7 +1083,6 @@ AC_DEFUN([gl_FILE_LIST], [
build-aux/useless-if-before-free
build-aux/vc-list-files
lib/accept.c
- lib/alignof.h
lib/alloca.c
lib/alloca.in.h
lib/alphasort.c
@@ -1207,6 +1208,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/socket.c
lib/sockets.c
lib/sockets.h
+ lib/stdalign.in.h
lib/stdarg.in.h
lib/stdbool.in.h
lib/stddef.in.h
@@ -1379,6 +1381,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/sockpfaf.m4
m4/ssize_t.m4
m4/stat.m4
+ m4/stdalign.m4
m4/stdarg.m4
m4/stdbool.m4
m4/stddef_h.m4
@@ -1548,6 +1551,7 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-sockets.c
tests/test-stat.c
tests/test-stat.h
+ tests/test-stdalign.c
tests/test-stdbool.c
tests/test-stddef.c
tests/test-stdint.c
diff --git a/gl/m4/math_h.m4 b/gl/m4/math_h.m4
index e5a2892..e58a9e9 100644
--- a/gl/m4/math_h.m4
+++ b/gl/m4/math_h.m4
@@ -1,4 +1,4 @@
-# math_h.m4 serial 53
+# math_h.m4 serial 56
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -41,7 +41,7 @@ AC_DEFUN([gl_MATH_H],
gl_WARN_ON_USE_PREPARE([[#include <math.h>]],
[acosf acosl asinf asinl atanf atanl
ceilf ceill copysign copysignf copysignl cosf cosl coshf
- expf expl fabsf floorf floorl fmodf frexpf frexpl
+ expf expl fabsf floorf floorl fma fmaf fmal fmodf frexpf frexpl
ldexpf ldexpl logb logf logl log10f modff powf
rint rintf rintl round roundf roundl sinf sinl sinhf sqrtf sqrtl
tanf tanl tanhf trunc truncf truncl])
@@ -80,6 +80,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
GNULIB_FLOOR=0; AC_SUBST([GNULIB_FLOOR])
GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF])
GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL])
+ GNULIB_FMA=0; AC_SUBST([GNULIB_FMA])
+ GNULIB_FMAF=0; AC_SUBST([GNULIB_FMAF])
+ GNULIB_FMAL=0; AC_SUBST([GNULIB_FMAL])
GNULIB_FMODF=0; AC_SUBST([GNULIB_FMODF])
GNULIB_FREXPF=0; AC_SUBST([GNULIB_FREXPF])
GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP])
@@ -133,6 +136,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
HAVE_EXPF=1; AC_SUBST([HAVE_EXPF])
HAVE_EXPL=1; AC_SUBST([HAVE_EXPL])
HAVE_FABSF=1; AC_SUBST([HAVE_FABSF])
+ HAVE_FMA=1; AC_SUBST([HAVE_FMA])
+ HAVE_FMAF=1; AC_SUBST([HAVE_FMAF])
+ HAVE_FMAL=1; AC_SUBST([HAVE_FMAL])
HAVE_FMODF=1; AC_SUBST([HAVE_FMODF])
HAVE_FREXPF=1; AC_SUBST([HAVE_FREXPF])
HAVE_ISNANF=1; AC_SUBST([HAVE_ISNANF])
@@ -183,6 +189,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
REPLACE_FLOOR=0; AC_SUBST([REPLACE_FLOOR])
REPLACE_FLOORF=0; AC_SUBST([REPLACE_FLOORF])
REPLACE_FLOORL=0; AC_SUBST([REPLACE_FLOORL])
+ REPLACE_FMA=0; AC_SUBST([REPLACE_FMA])
+ REPLACE_FMAF=0; AC_SUBST([REPLACE_FMAF])
+ REPLACE_FMAL=0; AC_SUBST([REPLACE_FMAL])
REPLACE_FREXPF=0; AC_SUBST([REPLACE_FREXPF])
REPLACE_FREXP=0; AC_SUBST([REPLACE_FREXP])
REPLACE_FREXPL=0; AC_SUBST([REPLACE_FREXPL])
diff --git a/gl/m4/stdalign.m4 b/gl/m4/stdalign.m4
new file mode 100644
index 0000000..da64dc6
--- /dev/null
+++ b/gl/m4/stdalign.m4
@@ -0,0 +1,22 @@
+# Check for stdalign.h that conforms to C1x.
+
+dnl Copyright 2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Prepare for substituting <stdalign.h> if it is not supported.
+
+AC_DEFUN([gl_STDALIGN_H],
+[
+ AC_CHECK_HEADERS_ONCE([stdalign.h])
+
+ if test $ac_cv_header_stdalign_h = yes; then
+ STDALIGN_H=''
+ else
+ STDALIGN_H='stdalign.h'
+ fi
+
+ AC_SUBST([STDALIGN_H])
+ AM_CONDITIONAL([GL_GENERATE_STDALIGN_H], [test -n "$STDALIGN_H"])
+])
diff --git a/gl/math.in.h b/gl/math.in.h
index e0742ec..eadb489 100644
--- a/gl/math.in.h
+++ b/gl/math.in.h
@@ -507,6 +507,80 @@ _GL_WARN_ON_USE (floorl, "floorl is unportable - "
#endif
+#if @GNULIB_FMAF@
+# if @REPLACE_FMAF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fmaf
+# define fmaf rpl_fmaf
+# endif
+_GL_FUNCDECL_RPL (fmaf, float, (float x, float y, float z));
+_GL_CXXALIAS_RPL (fmaf, float, (float x, float y, float z));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (fmaf, float, (float x, float y, float z));
+# endif
+_GL_CXXALIAS_SYS (fmaf, float, (float x, float y, float z));
+# endif
+_GL_CXXALIASWARN (fmaf);
+#elif defined GNULIB_POSIXCHECK
+# undef fmaf
+# if HAVE_RAW_DECL_FMAF
+_GL_WARN_ON_USE (fmaf, "fmaf is unportable - "
+ "use gnulib module fmaf for portability");
+# endif
+#endif
+
+#if @GNULIB_FMA@
+# if @REPLACE_FMA@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fma
+# define fma rpl_fma
+# endif
+_GL_FUNCDECL_RPL (fma, double, (double x, double y, double z));
+_GL_CXXALIAS_RPL (fma, double, (double x, double y, double z));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (fma, double, (double x, double y, double z));
+# endif
+_GL_CXXALIAS_SYS (fma, double, (double x, double y, double z));
+# endif
+_GL_CXXALIASWARN (fma);
+#elif defined GNULIB_POSIXCHECK
+# undef fma
+# if HAVE_RAW_DECL_FMA
+_GL_WARN_ON_USE (fma, "fma is unportable - "
+ "use gnulib module fma for portability");
+# endif
+#endif
+
+#if @GNULIB_FMAL@
+# if @REPLACE_FMAL@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fmal
+# define fmal rpl_fmal
+# endif
+_GL_FUNCDECL_RPL (fmal, long double,
+ (long double x, long double y, long double z));
+_GL_CXXALIAS_RPL (fmal, long double,
+ (long double x, long double y, long double z));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (fmal, long double,
+ (long double x, long double y, long double z));
+# endif
+_GL_CXXALIAS_SYS (fmal, long double,
+ (long double x, long double y, long double z));
+# endif
+_GL_CXXALIASWARN (fmal);
+#elif defined GNULIB_POSIXCHECK
+# undef fmal
+# if HAVE_RAW_DECL_FMAL
+_GL_WARN_ON_USE (fmal, "fmal is unportable - "
+ "use gnulib module fmal for portability");
+# endif
+#endif
+
+
#if @GNULIB_FMODF@
# if address@hidden@
# undef fmodf
diff --git a/gl/stdalign.in.h b/gl/stdalign.in.h
new file mode 100644
index 0000000..79e5691
--- /dev/null
+++ b/gl/stdalign.in.h
@@ -0,0 +1,89 @@
+/* A substitute for ISO C 1x <stdalign.h>.
+
+ Copyright 2011 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+/* Written by Paul Eggert and Bruno Haible. */
+
+#ifndef _GL_STDALIGN_H
+#define _GL_STDALIGN_H
+
+/* ISO C1X <stdalign.h> for platforms that lack it.
+
+ References:
+ ISO C1X <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf>
+ sections 6.5.3.4, 6.7.5, 7.15.
+ C++0X <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>
+ section 18.10. */
+
+/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment
+ requirement of a structure member (i.e., slot or field) that is of
+ type TYPE, as an integer constant expression.
+
+ This differs from GCC's __alignof__ operator, which can yield a
+ better-performing alignment for an object of that type. For
+ example, on x86 with GCC, __alignof__ (double) and __alignof__
+ (long long) are 8, whereas alignof (double) and alignof (long long)
+ are 4 unless the option '-malign-double' is used.
+
+ The result cannot be used as a value for an 'enum' constant, if you
+ want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */
+#include <stddef.h>
+#if defined __cplusplus
+ template <class __t> struct __alignof_helper { char __a; __t __b; };
+# define _Alignof(type) offsetof (__alignof_helper<type>, __b)
+#else
+# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
+#endif
+#define alignof _Alignof
+#define __alignof_is_defined 1
+
+/* alignas (A), also known as _Alignas (A), aligns a variable or type
+ to the alignment A, where A is an integer constant expression. For
+ example:
+
+ int alignas (8) foo;
+ struct s { int a; int alignas (8) bar; };
+
+ aligns the address of FOO and the offset of BAR to be multiples of 8.
+
+ A should be a power of two that is at least the type's alignment
+ and at most the implementation's alignment limit. This limit is
+ 2**28 on typical GNUish hosts, and 2**13 on MSVC. To be portable
+ to MSVC through at least version 10.0, A should be an integer
+ constant, as MSVC does not support expressions such as 1 << 3.
+ To be portable to Sun C 5.11, do not align auto variables to
+ anything stricter than their default alignment.
+
+ The following draft C1X requirements are not supported here:
+
+ - If A is zero, alignas has no effect.
+ - alignas can be used multiple times; the strictest one wins.
+ - alignas (TYPE) is equivalent to alignas (alignof (TYPE)).
+
+ */
+
+#if __GNUC__ || __IBMC__ || __IBMCPP__ || 0x5110 <= __SUNPRO_C
+# define _Alignas(a) __attribute__ ((__aligned__ (a)))
+#elif 1300 <= _MSC_VER
+# define _Alignas(a) __declspec (align (a))
+#endif
+#ifdef _Alignas
+# define alignas _Alignas
+# define __alignas_is_defined 1
+#endif
+
+#endif /* _GL_STDALIGN_H */
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index 19d0d67..1a8df49 100644
--- a/gl/stdlib.in.h
+++ b/gl/stdlib.in.h
@@ -247,7 +247,7 @@ _GL_CXXALIASWARN (grantpt);
#elif defined GNULIB_POSIXCHECK
# undef grantpt
# if HAVE_RAW_DECL_GRANTPT
-_GL_WARN_ON_USE (ptsname, "grantpt is not portable - "
+_GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
"use gnulib module grantpt for portability");
# endif
#endif
diff --git a/gl/sys_socket.in.h b/gl/sys_socket.in.h
index aba28f8..43681a4 100644
--- a/gl/sys_socket.in.h
+++ b/gl/sys_socket.in.h
@@ -85,7 +85,7 @@ typedef unsigned short sa_family_t;
# endif
# endif
#else
-# include <alignof.h>
+# include <stdalign.h>
/* Code taken from glibc sysdeps/unix/sysv/linux/bits/socket.h on
2009-05-08, licensed under LGPLv2.1+, plus portability fixes. */
# define __ss_aligntype unsigned long int
diff --git a/gl/tests/Makefile.am b/gl/tests/Makefile.am
index 4a96e59..0edbe38 100644
--- a/gl/tests/Makefile.am
+++ b/gl/tests/Makefile.am
@@ -1032,6 +1032,14 @@ EXTRA_DIST += test-stat.h test-stat.c signature.h
macros.h
## end gnulib module stat-tests
+## begin gnulib module stdalign-tests
+
+TESTS += test-stdalign
+check_PROGRAMS += test-stdalign
+EXTRA_DIST += test-stdalign.c macros.h
+
+## end gnulib module stdalign-tests
+
## begin gnulib module stdbool-tests
TESTS += test-stdbool
diff --git a/gl/tests/putenv.c b/gl/tests/putenv.c
index 3c33279..2da3376 100644
--- a/gl/tests/putenv.c
+++ b/gl/tests/putenv.c
@@ -36,7 +36,7 @@
#if _LIBC
# if HAVE_GNU_LD
-# define environ __environ
+# define environ __environ
# else
extern char **environ;
# endif
diff --git a/gl/tests/test-stdalign.c b/gl/tests/test-stdalign.c
new file mode 100644
index 0000000..7090a26
--- /dev/null
+++ b/gl/tests/test-stdalign.c
@@ -0,0 +1,116 @@
+/* Test of <stdalign.h>.
+ Copyright 2009-2011 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+/* Written by Paul Eggert, inspired by Bruno Haible's test-alignof.c. */
+
+#include <config.h>
+
+#include <stdalign.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "verify.h"
+
+#include "macros.h"
+
+typedef long double longdouble;
+typedef struct { char a[1]; } struct1;
+typedef struct { char a[2]; } struct2;
+typedef struct { char a[3]; } struct3;
+typedef struct { char a[4]; } struct4;
+
+verify (__alignof_is_defined == 1);
+#ifndef alignof
+# error "alignof is not a macro"
+#endif
+
+#if __alignas_is_defined
+verify (__alignas_is_defined == 1);
+# ifndef alignas
+# error "alignas is not a macro"
+# endif
+/* mingw can go up only to 8. 8 is all that GNU Emacs needs, so let's
+ limit the test to 8 for now. */
+# define TEST_ALIGNMENT 8
+#else
+# define _Alignas(alignment)
+# define alignas(alignment)
+# define TEST_ALIGNMENT 1
+#endif
+
+#define CHECK_STATIC(type) \
+ typedef struct { char slot1; type slot2; } type##_helper; \
+ verify (alignof (type) == offsetof (type##_helper, slot2)); \
+ verify (_Alignof (type) == alignof (type)); \
+ const int type##_alignment = alignof (type); \
+ type alignas (TEST_ALIGNMENT) static_##type##_alignas; \
+ type _Alignas (TEST_ALIGNMENT) static_##type##_Alignas
+
+#define CHECK_ALIGNED(var) ASSERT ((uintptr_t) &(var) % TEST_ALIGNMENT == 0)
+
+CHECK_STATIC (char);
+CHECK_STATIC (short);
+CHECK_STATIC (int);
+CHECK_STATIC (long);
+#ifdef INT64_MAX
+CHECK_STATIC (int64_t);
+#endif
+CHECK_STATIC (float);
+CHECK_STATIC (double);
+CHECK_STATIC (longdouble);
+CHECK_STATIC (struct1);
+CHECK_STATIC (struct2);
+CHECK_STATIC (struct3);
+CHECK_STATIC (struct4);
+
+int
+main ()
+{
+#if defined __SUNPRO_C
+ /* Avoid a test failure due to Sun Studio Developer Bug Report #2125432. */
+ fputs ("Skipping test: known Sun C compiler bug\n", stderr);
+ return 77;
+#else
+ CHECK_ALIGNED (static_char_alignas);
+ CHECK_ALIGNED (static_char_Alignas);
+ CHECK_ALIGNED (static_short_alignas);
+ CHECK_ALIGNED (static_short_Alignas);
+ CHECK_ALIGNED (static_int_alignas);
+ CHECK_ALIGNED (static_int_Alignas);
+ CHECK_ALIGNED (static_long_alignas);
+ CHECK_ALIGNED (static_long_Alignas);
+# ifdef INT64_MAX
+ CHECK_ALIGNED (static_int64_t_alignas);
+ CHECK_ALIGNED (static_int64_t_Alignas);
+# endif
+ CHECK_ALIGNED (static_float_alignas);
+ CHECK_ALIGNED (static_float_Alignas);
+ CHECK_ALIGNED (static_double_alignas);
+ CHECK_ALIGNED (static_double_Alignas);
+ CHECK_ALIGNED (static_longdouble_alignas);
+ CHECK_ALIGNED (static_longdouble_Alignas);
+ CHECK_ALIGNED (static_struct1_alignas);
+ CHECK_ALIGNED (static_struct1_Alignas);
+ CHECK_ALIGNED (static_struct2_alignas);
+ CHECK_ALIGNED (static_struct2_Alignas);
+ CHECK_ALIGNED (static_struct3_alignas);
+ CHECK_ALIGNED (static_struct3_Alignas);
+ CHECK_ALIGNED (static_struct4_alignas);
+ CHECK_ALIGNED (static_struct4_Alignas);
+ return 0;
+#endif
+}
diff --git a/lib/accelerated/x86/hmac-padlock.c
b/lib/accelerated/x86/hmac-padlock.c
index 8a4508c..7b7a294 100644
--- a/lib/accelerated/x86/hmac-padlock.c
+++ b/lib/accelerated/x86/hmac-padlock.c
@@ -30,7 +30,6 @@
#include <nettle/hmac.h>
#include <nettle/macros.h>
#include <aes-padlock.h>
-#include <assert.h>
#include <sha-padlock.h>
#ifdef HAVE_LIBNETTLE
diff --git a/maint.mk b/maint.mk
index 4c71187..d2f5830 100644
--- a/maint.mk
+++ b/maint.mk
@@ -21,8 +21,12 @@
# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
ME := maint.mk
-# Override this in cfg.mk if you use a non-standard build-aux directory.
-build_aux ?= $(srcdir)/build-aux
+# Diagnostic for continued use of deprecated variable.
+# Remove in 2013
+ifneq ($(build_aux),)
+ $(error "$(ME): \
+set $$(_build-aux) relative to $$(srcdir) instead of $$(build_aux)")
+endif
# Do not save the original name or timestamp in the .tar.gz file.
# Use --rsyncable if available.
@@ -34,7 +38,7 @@ GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
GIT = git
VC = $(GIT)
-VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
+VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir)
# You can override this variable in cfg.mk to set your own regexp
# matching files to ignore.
@@ -274,7 +278,7 @@ define _sc_search_regexp
endef
sc_avoid_if_before_free:
- @$(build_aux)/useless-if-before-free \
+ @$(srcdir)/$(_build-aux)/useless-if-before-free \
$(useless_free_options) \
$$($(VC_LIST_EXCEPT) | grep -v useless-if-before-free) && \
{ echo '$(ME): found useless "if" before "free" above' 1>&2; \
@@ -621,6 +625,16 @@ sc_prohibit_stddef_without_use:
re='\<($(_stddef_syms_re))\>' \
$(_sc_header_without_use)
+_de1 = dirfd|(close|(fd)?open|read|rewind|seek|tell)dir(64)?(_r)?
+_de2 = (versionsort|struct dirent|getdirentries|alphasort|scandir(at)?)(64)?
+_de3 = MAXNAMLEN|DIR|ino_t|d_ino|d_fileno|d_namlen
+_dirent_syms_re = $(_de1)|$(_de2)|$(_de3)
+# Prohibit the inclusion of dirent.h without an actual use.
+sc_prohibit_dirent_without_use:
+ @h='dirent.h' \
+ re='\<($(_dirent_syms_re))\>' \
+ $(_sc_header_without_use)
+
# Prohibit the inclusion of verify.h without an actual use.
sc_prohibit_verify_without_use:
@h='verify.h' \
@@ -1189,9 +1203,9 @@ bootstrap-tools ?= autoconf,automake,gnulib
# If it's not already specified, derive the GPG key ID from
# the signed tag we've just applied to mark this release.
gpg_key_ID ?= \
- $$(git cat-file tag v$(VERSION) > .ann-sig \
- && gpgv .ann-sig - < /dev/null 2>&1 \
- | sed -n '/.*key ID \([0-9A-F]*\)/s//\1/p'; rm -f .ann-sig)
+ $$(git cat-file tag v$(VERSION) \
+ | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
+ | sed -n '/^\[GNUPG:\] ERRSIG /{s///;s/ .*//p;q}')
translation_project_ ?= address@hidden
@@ -1210,7 +1224,7 @@ else
endif
announcement: NEWS ChangeLog $(rel-files)
- @$(build_aux)/announce-gen \
+ @$(srcdir)/$(_build-aux)/announce-gen \
--mail-headers='$(announcement_mail_headers_)' \
--release-type=$(RELEASE_TYPE) \
--package=$(PACKAGE) \
@@ -1234,7 +1248,7 @@ upload_dest_dir_ ?= $(PACKAGE)
emit_upload_commands:
@echo =====================================
@echo =====================================
- @echo "$(build_aux)/gnupload $(GNUPLOADFLAGS) \\"
+ @echo "$(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \\"
@echo " --to $(gnu_rel_host):$(upload_dest_dir_) \\"
@echo " $(rel-files)"
@echo '# send the ~/announce-$(my_distdir) e-mail'
@@ -1329,7 +1343,7 @@ web-manual:
@test -z "$(manual_title)" \
&& { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
@cd '$(srcdir)/doc'; \
- $(SHELL) ../$(build_aux)/gendocs.sh $(gendocs_options_) \
+ $(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \
-o '$(abs_builddir)/doc/manual' \
--email $(PACKAGE_BUGREPORT) $(PACKAGE) \
"$(PACKAGE_NAME) - $(manual_title)"
@@ -1394,7 +1408,7 @@ update-copyright-env ?=
update-copyright:
grep -l -w Copyright \
$$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \
- | $(update-copyright-env) xargs $(build_aux)/$@
+ | $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@
# This tight_scope test is skipped with a warning if $(_gl_TS_headers) is not
# overridden and $(_gl_TS_dir)/Makefile.am does not mention noinst_HEADERS.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 606f5ed..c1e332c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,14 +57,14 @@ endif
noinst_LTLIBRARIES = libutils.la
libutils_la_SOURCES = utils.h utils.c
-ctests = mini-deflate simple gc set_pkcs12_cred certder certuniqueid mpi
\
- certificate_set_x509_crl dn parse_ca moredn mini \
- hostname-check cve-2008-4989 pkcs12_s2k chainverify crq_key_id \
- x509sign-verify cve-2009-1415 cve-2009-1416 crq_apis \
- init_roundtrip pkcs12_s2k_pem dn2 mini-eagain \
- nul-in-x509-names x509_altname pkcs12_encode mini-x509 \
- mini-x509-rehandshake rng-fork mini-eagain-dtls cipher-test \
- x509cert x509cert-tl infoaccess #gendh
+ctests = mini-deflate simple gc set_pkcs12_cred certder certuniqueid \
+ mpi certificate_set_x509_crl dn parse_ca moredn mini \
+ hostname-check cve-2008-4989 pkcs12_s2k chainverify \
+ crq_key_id x509sign-verify cve-2009-1415 cve-2009-1416 \
+ crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain \
+ nul-in-x509-names x509_altname pkcs12_encode mini-x509 \
+ mini-x509-rehandshake rng-fork mini-eagain-dtls cipher-test \
+ x509cert x509cert-tl infoaccess #gendh
#gendh is out because it is too slow in valgrind
if ENABLE_OPENSSL
diff --git a/tests/rsa-md5-collision/README b/tests/rsa-md5-collision/README
index 98892d6..be0772a 100644
--- a/tests/rsa-md5-collision/README
+++ b/tests/rsa-md5-collision/README
@@ -1,5 +1,5 @@
rsa-md5-collision README -- Information about rsa-md5-collision self tests.
-Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2006-2011 Free Software Foundation, Inc.
See the end for copying conditions.
This directory contains colliding X.509 certificates for different
@@ -37,7 +37,7 @@ Xref: localhost.localdomain rsa-md5:1
Great work, thanks!
I'd like to include your certificates in GnuTLS, a TLS implementation
-that supports X.509, as self-tests of the the certificate verification
+that supports X.509, as self-tests of the certificate verification
logic. Is this OK with you?
Btw, Gnutls rejected the certificates, we already disable MD5 for
@@ -152,7 +152,7 @@ identities
Great work, thanks!
I'd like to include your certificates in GnuTLS, a TLS implementation
-that supports X.509, as self-tests of the the certificate verification
+that supports X.509, as self-tests of the certificate verification
logic. Is this OK with you?
Btw, Gnutls rejected the certificates, we already disable MD5 for
@@ -254,7 +254,7 @@ Benne also replied.
> Great work, thanks!
>
> I'd like to include your certificates in GnuTLS, a TLS implementation
-> that supports X.509, as self-tests of the the certificate verification
+> that supports X.509, as self-tests of the certificate verification
> logic. Is this OK with you?
>
> Btw, Gnutls rejected the certificates, we already disable MD5 for
@@ -402,7 +402,7 @@ identities
>> Great work, thanks!
>>
>> I'd like to include your certificates in GnuTLS, a TLS implementation
->> that supports X.509, as self-tests of the the certificate verification
+>> that supports X.509, as self-tests of the certificate verification
>> logic. Is this OK with you?
>>
>> Btw, Gnutls rejected the certificates, we already disable MD5 for
@@ -565,7 +565,7 @@ www: http://www.win.tue.nl/~bdeweger
> >
> > I'd like to include your certificates in GnuTLS, a TLS=20
> implementation
-> > that supports X.509, as self-tests of the the certificate=20
+> > that supports X.509, as self-tests of the certificate=20
> verification
> > logic. Is this OK with you?
> >
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-18-g8f8cea0,
Simon Josefsson <=