From: Nikos Mavrogiannopoulos Date: Fri, 12 Oct 2012 08:05:22 +0000 (+0200) Subject: use common definitions for generating docs. X-Git-Tag: gnutls_3_1_3~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=796708dfb6126aec71a2d354df41510637cf22ec;p=thirdparty%2Fgnutls.git use common definitions for generating docs. --- diff --git a/doc/Makefile.am b/doc/Makefile.am index c9d84ee719..7f4a8a6915 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,13 +21,16 @@ EXTRA_DIST = TODO certtool.cfg gnutls.pdf gnutls.html \ doxygen/Doxyfile.in doxygen/Doxyfile.orig texinfo.css \ - gnutls-guile.pdf gnutls-guile.html stamp_enums stamp_functions + gnutls-guile.pdf gnutls-guile.html stamp_enums stamp_functions \ + doc.mk SUBDIRS = examples cyclo scripts manpages credentials latex if ENABLE_GTK_DOC SUBDIRS += reference endif +-include $(top_srcdir)/doc/doc.mk + SRC_DEF_CLI = SRC_DEF_CLI_DEBUG = SRC_DEF_SERV = @@ -207,13 +210,6 @@ MAINTAINERCLEANFILES += gnutls-api.texi x509-api.texi pgp-api.texi \ compat-api.texi dtls-api.texi crypto-api.texi ocsp-api.texi \ dane-api.texi -HEADER_FILES = $(top_srcdir)/lib/includes/gnutls/gnutls.h.in \ - $(top_srcdir)/lib/includes/gnutls/x509.h $(top_srcdir)/lib/includes/gnutls/openpgp.h \ - $(top_srcdir)/lib/includes/gnutls/pkcs12.h $(top_srcdir)/lib/includes/gnutls/pkcs11.h \ - $(top_srcdir)/lib/includes/gnutls/abstract.h $(top_srcdir)/lib/includes/gnutls/compat.h \ - $(top_srcdir)/lib/includes/gnutls/dtls.h $(top_srcdir)/lib/includes/gnutls/crypto.h \ - $(top_srcdir)/lib/includes/gnutls/ocsp.h $(top_srcdir)/lib/includes/gnutls/tpm.h \ - $(top_srcdir)/libdane/includes/gnutls/dane.h gnutls-api.texi: $(top_srcdir)/lib/includes/gnutls/gnutls.h.in echo "" > $@-tmp @@ -221,7 +217,7 @@ gnutls-api.texi: $(top_srcdir)/lib/includes/gnutls/gnutls.h.in echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -232,7 +228,7 @@ dane-api.texi: $(top_srcdir)/libdane/includes/gnutls/dane.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/libdane/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -243,7 +239,7 @@ x509-api.texi: $(top_srcdir)/lib/includes/gnutls/x509.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -254,7 +250,7 @@ pgp-api.texi: $(top_srcdir)/lib/includes/gnutls/openpgp.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -266,7 +262,7 @@ pkcs12-api.texi: $(top_srcdir)/lib/includes/gnutls/pkcs12.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -277,7 +273,7 @@ pkcs11-api.texi: $(top_srcdir)/lib/includes/gnutls/pkcs11.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -288,7 +284,7 @@ tpm-api.texi: $(top_srcdir)/lib/includes/gnutls/tpm.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -299,7 +295,7 @@ abstract-api.texi: $(top_srcdir)/lib/includes/gnutls/abstract.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -310,7 +306,7 @@ compat-api.texi: $(top_srcdir)/lib/includes/gnutls/compat.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -321,7 +317,7 @@ dtls-api.texi: $(top_srcdir)/lib/includes/gnutls/dtls.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -332,7 +328,7 @@ crypto-api.texi: $(top_srcdir)/lib/includes/gnutls/crypto.h echo -n "Creating documentation for $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -343,7 +339,7 @@ ocsp-api.texi: $(top_srcdir)/lib/includes/gnutls/ocsp.h echo -n "Creating documentation for file $$i... " && \ $(srcdir)/scripts/gdoc -texinfo \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c >> $@-tmp 2>/dev/null && \ + $(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \ echo "ok"; \ done mv -f $@-tmp $@ @@ -418,7 +414,7 @@ $(ENUMS): stamp_enums $(FUNCS): stamp_functions compare-makefile: enums.texi - ENUMS=`grep '^@c ' $(srcdir)/enums.texi | sed 's/@c //g' | sort`; \ + ENUMS=`grep '^@c ' $(srcdir)/enums.texi | sed 's/@c //g' | sort -d`; \ STR=""; \ for i in $$ENUMS; do \ STR="$$STR\nENUMS += enums/$$i"; \ @@ -427,7 +423,7 @@ compare-makefile: enums.texi perl -p -e "s,^ENUMS =,ENUMS =$$STR," > tmp-$@; \ diff -u $(srcdir)/Makefile.am tmp-$@ rm -f tmp-$@ - FUNCS=`cat $(HEADER_FILES) | $(top_srcdir)/doc/scripts/getfuncs.pl|sort`; \ + FUNCS=`cat $(HEADER_FILES) | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \ MANS=""; \ for i in $$FUNCS; do \ MANS="$$MANS\nFUNCS += functions/$$i\nFUNCS += functions/$$i.short"; \ @@ -482,6 +478,12 @@ gnutls.epub: gnutls.xml epub-fix --delete-unmanifested gnutls.epub ENUMS = +ENUMS += enums/dane_cert_type_t +ENUMS += enums/dane_cert_usage_t +ENUMS += enums/dane_match_type_t +ENUMS += enums/dane_query_status_t +ENUMS += enums/dane_verify_flags_t +ENUMS += enums/dane_verify_status_t ENUMS += enums/gnutls_alert_description_t ENUMS += enums/gnutls_alert_level_t ENUMS += enums/gnutls_certificate_import_flags @@ -500,6 +502,10 @@ ENUMS += enums/gnutls_ecc_curve_t ENUMS += enums/gnutls_handshake_description_t ENUMS += enums/gnutls_kx_algorithm_t ENUMS += enums/gnutls_mac_algorithm_t +ENUMS += enums/gnutls_ocsp_cert_status_t +ENUMS += enums/gnutls_ocsp_print_formats_t +ENUMS += enums/gnutls_ocsp_resp_status_t +ENUMS += enums/gnutls_ocsp_verify_reason_t ENUMS += enums/gnutls_openpgp_crt_fmt_t ENUMS += enums/gnutls_openpgp_crt_status_t ENUMS += enums/gnutls_params_type_t @@ -520,10 +526,31 @@ ENUMS += enums/gnutls_server_name_type_t ENUMS += enums/gnutls_sign_algorithm_t ENUMS += enums/gnutls_supplemental_data_format_type_t ENUMS += enums/gnutls_tpmkey_fmt_t +ENUMS += enums/gnutls_x509_crl_reason_t ENUMS += enums/gnutls_x509_crt_fmt_t ENUMS += enums/gnutls_x509_subject_alt_name_t FUNCS = +FUNCS += functions/dane_query_data +FUNCS += functions/dane_query_data.short +FUNCS += functions/dane_query_deinit +FUNCS += functions/dane_query_deinit.short +FUNCS += functions/dane_query_entries +FUNCS += functions/dane_query_entries.short +FUNCS += functions/dane_query_status +FUNCS += functions/dane_query_status.short +FUNCS += functions/dane_query_tlsa +FUNCS += functions/dane_query_tlsa.short +FUNCS += functions/dane_state_deinit +FUNCS += functions/dane_state_deinit.short +FUNCS += functions/dane_state_init +FUNCS += functions/dane_state_init.short +FUNCS += functions/dane_strerror +FUNCS += functions/dane_strerror.short +FUNCS += functions/dane_verify_crt +FUNCS += functions/dane_verify_crt.short +FUNCS += functions/dane_verify_session_crt +FUNCS += functions/dane_verify_session_crt.short FUNCS += functions/gnutls_alert_get FUNCS += functions/gnutls_alert_get.short FUNCS += functions/gnutls_alert_get_name @@ -580,6 +607,8 @@ FUNCS += functions/gnutls_certificate_get_ours FUNCS += functions/gnutls_certificate_get_ours.short FUNCS += functions/gnutls_certificate_get_peers FUNCS += functions/gnutls_certificate_get_peers.short +FUNCS += functions/gnutls_certificate_get_peers_subkey_id +FUNCS += functions/gnutls_certificate_get_peers_subkey_id.short FUNCS += functions/gnutls_certificate_send_x509_rdn_sequence FUNCS += functions/gnutls_certificate_send_x509_rdn_sequence.short FUNCS += functions/gnutls_certificate_server_set_request @@ -588,6 +617,10 @@ FUNCS += functions/gnutls_certificate_set_dh_params FUNCS += functions/gnutls_certificate_set_dh_params.short FUNCS += functions/gnutls_certificate_set_key FUNCS += functions/gnutls_certificate_set_key.short +FUNCS += functions/gnutls_certificate_set_ocsp_status_request_file +FUNCS += functions/gnutls_certificate_set_ocsp_status_request_file.short +FUNCS += functions/gnutls_certificate_set_ocsp_status_request_function +FUNCS += functions/gnutls_certificate_set_ocsp_status_request_function.short FUNCS += functions/gnutls_certificate_set_openpgp_key FUNCS += functions/gnutls_certificate_set_openpgp_key.short FUNCS += functions/gnutls_certificate_set_openpgp_key_file @@ -738,6 +771,8 @@ FUNCS += functions/gnutls_dh_params_cpy FUNCS += functions/gnutls_dh_params_cpy.short FUNCS += functions/gnutls_dh_params_deinit FUNCS += functions/gnutls_dh_params_deinit.short +FUNCS += functions/gnutls_dh_params_export2_pkcs3 +FUNCS += functions/gnutls_dh_params_export2_pkcs3.short FUNCS += functions/gnutls_dh_params_export_pkcs3 FUNCS += functions/gnutls_dh_params_export_pkcs3.short FUNCS += functions/gnutls_dh_params_export_raw @@ -912,6 +947,8 @@ FUNCS += functions/gnutls_ocsp_req_set_extension FUNCS += functions/gnutls_ocsp_req_set_extension.short FUNCS += functions/gnutls_ocsp_req_set_nonce FUNCS += functions/gnutls_ocsp_req_set_nonce.short +FUNCS += functions/gnutls_ocsp_resp_check_crt +FUNCS += functions/gnutls_ocsp_resp_check_crt.short FUNCS += functions/gnutls_ocsp_resp_deinit FUNCS += functions/gnutls_ocsp_resp_deinit.short FUNCS += functions/gnutls_ocsp_resp_export @@ -948,12 +985,18 @@ FUNCS += functions/gnutls_ocsp_resp_verify FUNCS += functions/gnutls_ocsp_resp_verify.short FUNCS += functions/gnutls_ocsp_resp_verify_direct FUNCS += functions/gnutls_ocsp_resp_verify_direct.short +FUNCS += functions/gnutls_ocsp_status_request_enable_client +FUNCS += functions/gnutls_ocsp_status_request_enable_client.short +FUNCS += functions/gnutls_ocsp_status_request_get +FUNCS += functions/gnutls_ocsp_status_request_get.short FUNCS += functions/gnutls_openpgp_crt_check_hostname FUNCS += functions/gnutls_openpgp_crt_check_hostname.short FUNCS += functions/gnutls_openpgp_crt_deinit FUNCS += functions/gnutls_openpgp_crt_deinit.short FUNCS += functions/gnutls_openpgp_crt_export FUNCS += functions/gnutls_openpgp_crt_export.short +FUNCS += functions/gnutls_openpgp_crt_export2 +FUNCS += functions/gnutls_openpgp_crt_export2.short FUNCS += functions/gnutls_openpgp_crt_get_auth_subkey FUNCS += functions/gnutls_openpgp_crt_get_auth_subkey.short FUNCS += functions/gnutls_openpgp_crt_get_creation_time @@ -1030,6 +1073,8 @@ FUNCS += functions/gnutls_openpgp_privkey_deinit FUNCS += functions/gnutls_openpgp_privkey_deinit.short FUNCS += functions/gnutls_openpgp_privkey_export FUNCS += functions/gnutls_openpgp_privkey_export.short +FUNCS += functions/gnutls_openpgp_privkey_export2 +FUNCS += functions/gnutls_openpgp_privkey_export2.short FUNCS += functions/gnutls_openpgp_privkey_export_dsa_raw FUNCS += functions/gnutls_openpgp_privkey_export_dsa_raw.short FUNCS += functions/gnutls_openpgp_privkey_export_rsa_raw @@ -1122,6 +1167,8 @@ FUNCS += functions/gnutls_pkcs11_obj_deinit FUNCS += functions/gnutls_pkcs11_obj_deinit.short FUNCS += functions/gnutls_pkcs11_obj_export FUNCS += functions/gnutls_pkcs11_obj_export.short +FUNCS += functions/gnutls_pkcs11_obj_export2 +FUNCS += functions/gnutls_pkcs11_obj_export2.short FUNCS += functions/gnutls_pkcs11_obj_export_url FUNCS += functions/gnutls_pkcs11_obj_export_url.short FUNCS += functions/gnutls_pkcs11_obj_get_info @@ -1206,6 +1253,8 @@ FUNCS += functions/gnutls_pkcs12_deinit FUNCS += functions/gnutls_pkcs12_deinit.short FUNCS += functions/gnutls_pkcs12_export FUNCS += functions/gnutls_pkcs12_export.short +FUNCS += functions/gnutls_pkcs12_export2 +FUNCS += functions/gnutls_pkcs12_export2.short FUNCS += functions/gnutls_pkcs12_generate_mac FUNCS += functions/gnutls_pkcs12_generate_mac.short FUNCS += functions/gnutls_pkcs12_get_bag @@ -1228,6 +1277,8 @@ FUNCS += functions/gnutls_pkcs7_delete_crt FUNCS += functions/gnutls_pkcs7_delete_crt.short FUNCS += functions/gnutls_pkcs7_export FUNCS += functions/gnutls_pkcs7_export.short +FUNCS += functions/gnutls_pkcs7_export2 +FUNCS += functions/gnutls_pkcs7_export2.short FUNCS += functions/gnutls_pkcs7_get_crl_count FUNCS += functions/gnutls_pkcs7_get_crl_count.short FUNCS += functions/gnutls_pkcs7_get_crl_raw @@ -1362,6 +1413,8 @@ FUNCS += functions/gnutls_pubkey_encrypt_data FUNCS += functions/gnutls_pubkey_encrypt_data.short FUNCS += functions/gnutls_pubkey_export FUNCS += functions/gnutls_pubkey_export.short +FUNCS += functions/gnutls_pubkey_export2 +FUNCS += functions/gnutls_pubkey_export2.short FUNCS += functions/gnutls_pubkey_get_key_id FUNCS += functions/gnutls_pubkey_get_key_id.short FUNCS += functions/gnutls_pubkey_get_key_usage @@ -1392,6 +1445,8 @@ FUNCS += functions/gnutls_pubkey_import_ecc_x962 FUNCS += functions/gnutls_pubkey_import_ecc_x962.short FUNCS += functions/gnutls_pubkey_import_openpgp FUNCS += functions/gnutls_pubkey_import_openpgp.short +FUNCS += functions/gnutls_pubkey_import_openpgp_raw +FUNCS += functions/gnutls_pubkey_import_openpgp_raw.short FUNCS += functions/gnutls_pubkey_import_pkcs11 FUNCS += functions/gnutls_pubkey_import_pkcs11.short FUNCS += functions/gnutls_pubkey_import_pkcs11_url @@ -1408,6 +1463,8 @@ FUNCS += functions/gnutls_pubkey_import_url FUNCS += functions/gnutls_pubkey_import_url.short FUNCS += functions/gnutls_pubkey_import_x509 FUNCS += functions/gnutls_pubkey_import_x509.short +FUNCS += functions/gnutls_pubkey_import_x509_raw +FUNCS += functions/gnutls_pubkey_import_x509_raw.short FUNCS += functions/gnutls_pubkey_init FUNCS += functions/gnutls_pubkey_init.short FUNCS += functions/gnutls_pubkey_set_key_usage @@ -1558,10 +1615,6 @@ FUNCS += functions/gnutls_srp_set_server_credentials_function FUNCS += functions/gnutls_srp_set_server_credentials_function.short FUNCS += functions/gnutls_srp_verifier FUNCS += functions/gnutls_srp_verifier.short -FUNCS += functions/gnutls_status_request_ocsp_client -FUNCS += functions/gnutls_status_request_ocsp_client.short -FUNCS += functions/gnutls_status_request_ocsp_server -FUNCS += functions/gnutls_status_request_ocsp_server.short FUNCS += functions/gnutls_store_commitment FUNCS += functions/gnutls_store_commitment.short FUNCS += functions/gnutls_store_pubkey @@ -1622,6 +1675,8 @@ FUNCS += functions/gnutls_x509_crl_deinit FUNCS += functions/gnutls_x509_crl_deinit.short FUNCS += functions/gnutls_x509_crl_export FUNCS += functions/gnutls_x509_crl_export.short +FUNCS += functions/gnutls_x509_crl_export2 +FUNCS += functions/gnutls_x509_crl_export2.short FUNCS += functions/gnutls_x509_crl_get_authority_key_gn_serial FUNCS += functions/gnutls_x509_crl_get_authority_key_gn_serial.short FUNCS += functions/gnutls_x509_crl_get_authority_key_id @@ -1692,6 +1747,8 @@ FUNCS += functions/gnutls_x509_crq_deinit FUNCS += functions/gnutls_x509_crq_deinit.short FUNCS += functions/gnutls_x509_crq_export FUNCS += functions/gnutls_x509_crq_export.short +FUNCS += functions/gnutls_x509_crq_export2 +FUNCS += functions/gnutls_x509_crq_export2.short FUNCS += functions/gnutls_x509_crq_get_attribute_by_oid FUNCS += functions/gnutls_x509_crq_get_attribute_by_oid.short FUNCS += functions/gnutls_x509_crq_get_attribute_data @@ -1782,6 +1839,8 @@ FUNCS += functions/gnutls_x509_crt_deinit FUNCS += functions/gnutls_x509_crt_deinit.short FUNCS += functions/gnutls_x509_crt_export FUNCS += functions/gnutls_x509_crt_export.short +FUNCS += functions/gnutls_x509_crt_export2 +FUNCS += functions/gnutls_x509_crt_export2.short FUNCS += functions/gnutls_x509_crt_get_activation_time FUNCS += functions/gnutls_x509_crt_get_activation_time.short FUNCS += functions/gnutls_x509_crt_get_authority_info_access @@ -1960,6 +2019,8 @@ FUNCS += functions/gnutls_x509_dn_deinit FUNCS += functions/gnutls_x509_dn_deinit.short FUNCS += functions/gnutls_x509_dn_export FUNCS += functions/gnutls_x509_dn_export.short +FUNCS += functions/gnutls_x509_dn_export2 +FUNCS += functions/gnutls_x509_dn_export2.short FUNCS += functions/gnutls_x509_dn_get_rdn_ava FUNCS += functions/gnutls_x509_dn_get_rdn_ava.short FUNCS += functions/gnutls_x509_dn_import @@ -1976,6 +2037,10 @@ FUNCS += functions/gnutls_x509_privkey_deinit FUNCS += functions/gnutls_x509_privkey_deinit.short FUNCS += functions/gnutls_x509_privkey_export FUNCS += functions/gnutls_x509_privkey_export.short +FUNCS += functions/gnutls_x509_privkey_export2 +FUNCS += functions/gnutls_x509_privkey_export2.short +FUNCS += functions/gnutls_x509_privkey_export2_pkcs8 +FUNCS += functions/gnutls_x509_privkey_export2_pkcs8.short FUNCS += functions/gnutls_x509_privkey_export_dsa_raw FUNCS += functions/gnutls_x509_privkey_export_dsa_raw.short FUNCS += functions/gnutls_x509_privkey_export_ecc_raw diff --git a/doc/doc.mk b/doc/doc.mk new file mode 100644 index 0000000000..6f67f61d9d --- /dev/null +++ b/doc/doc.mk @@ -0,0 +1,29 @@ +# Copyright (C) 2012 Free Software Foundation, Inc. +# +# Author: Nikos Mavrogiannopoulos +# +# This file is part of GnuTLS. +# +# This file 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 file 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 file; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +HEADER_FILES = $(top_srcdir)/lib/includes/gnutls/gnutls.h.in \ + $(top_srcdir)/lib/includes/gnutls/x509.h $(top_srcdir)/lib/includes/gnutls/openpgp.h \ + $(top_srcdir)/lib/includes/gnutls/pkcs12.h $(top_srcdir)/lib/includes/gnutls/pkcs11.h \ + $(top_srcdir)/lib/includes/gnutls/abstract.h $(top_srcdir)/lib/includes/gnutls/compat.h \ + $(top_srcdir)/lib/includes/gnutls/dtls.h $(top_srcdir)/lib/includes/gnutls/crypto.h \ + $(top_srcdir)/lib/includes/gnutls/ocsp.h $(top_srcdir)/lib/includes/gnutls/tpm.h \ + $(top_srcdir)/libdane/includes/gnutls/dane.h + +C_SOURCE_FILES = $(top_srcdir)/lib/*/*.c $(top_srcdir)/lib/*.c $(top_srcdir)/libdane/*.c diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am index 47dade5947..ab2566acd4 100644 --- a/doc/manpages/Makefile.am +++ b/doc/manpages/Makefile.am @@ -22,18 +22,12 @@ dist_man_MANS = gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1 \ certtool.1 psktool.1 p11tool.1 ocsptool.1 tpmtool.1 +-include $(top_srcdir)/doc/doc.mk + if ENABLE_SRP dist_man_MANS += srptool.1 endif -HEADER_FILES = $(top_srcdir)/lib/includes/gnutls/gnutls.h.in \ - $(top_srcdir)/lib/includes/gnutls/x509.h $(top_srcdir)/lib/includes/gnutls/openpgp.h \ - $(top_srcdir)/lib/includes/gnutls/pkcs12.h $(top_srcdir)/lib/includes/gnutls/pkcs11.h \ - $(top_srcdir)/lib/includes/gnutls/abstract.h $(top_srcdir)/lib/includes/gnutls/compat.h \ - $(top_srcdir)/lib/includes/gnutls/dtls.h $(top_srcdir)/lib/includes/gnutls/crypto.h \ - $(top_srcdir)/lib/includes/gnutls/ocsp.h $(top_srcdir)/lib/includes/gnutls/tpm.h \ - $(top_srcdir)/libdane/includes/gnutls/dane.h - # Note that our .def files depend on autogen # supporting the @subheading texi keyword. This # is not currently the case so we do remove it @@ -114,10 +108,13 @@ APIMANS += gnutls_certificate_free_keys.3 APIMANS += gnutls_certificate_get_issuer.3 APIMANS += gnutls_certificate_get_ours.3 APIMANS += gnutls_certificate_get_peers.3 +APIMANS += gnutls_certificate_get_peers_subkey_id.3 APIMANS += gnutls_certificate_send_x509_rdn_sequence.3 APIMANS += gnutls_certificate_server_set_request.3 APIMANS += gnutls_certificate_set_dh_params.3 APIMANS += gnutls_certificate_set_key.3 +APIMANS += gnutls_certificate_set_ocsp_status_request_file.3 +APIMANS += gnutls_certificate_set_ocsp_status_request_function.3 APIMANS += gnutls_certificate_set_openpgp_key.3 APIMANS += gnutls_certificate_set_openpgp_key_file.3 APIMANS += gnutls_certificate_set_openpgp_key_file2.3 @@ -193,6 +190,7 @@ APIMANS += gnutls_dh_get_pubkey.3 APIMANS += gnutls_dh_get_secret_bits.3 APIMANS += gnutls_dh_params_cpy.3 APIMANS += gnutls_dh_params_deinit.3 +APIMANS += gnutls_dh_params_export2_pkcs3.3 APIMANS += gnutls_dh_params_export_pkcs3.3 APIMANS += gnutls_dh_params_export_raw.3 APIMANS += gnutls_dh_params_generate2.3 @@ -280,6 +278,7 @@ APIMANS += gnutls_ocsp_req_print.3 APIMANS += gnutls_ocsp_req_randomize_nonce.3 APIMANS += gnutls_ocsp_req_set_extension.3 APIMANS += gnutls_ocsp_req_set_nonce.3 +APIMANS += gnutls_ocsp_resp_check_crt.3 APIMANS += gnutls_ocsp_resp_deinit.3 APIMANS += gnutls_ocsp_resp_export.3 APIMANS += gnutls_ocsp_resp_get_certs.3 @@ -298,9 +297,12 @@ APIMANS += gnutls_ocsp_resp_init.3 APIMANS += gnutls_ocsp_resp_print.3 APIMANS += gnutls_ocsp_resp_verify.3 APIMANS += gnutls_ocsp_resp_verify_direct.3 +APIMANS += gnutls_ocsp_status_request_enable_client.3 +APIMANS += gnutls_ocsp_status_request_get.3 APIMANS += gnutls_openpgp_crt_check_hostname.3 APIMANS += gnutls_openpgp_crt_deinit.3 APIMANS += gnutls_openpgp_crt_export.3 +APIMANS += gnutls_openpgp_crt_export2.3 APIMANS += gnutls_openpgp_crt_get_auth_subkey.3 APIMANS += gnutls_openpgp_crt_get_creation_time.3 APIMANS += gnutls_openpgp_crt_get_expiration_time.3 @@ -339,6 +341,7 @@ APIMANS += gnutls_openpgp_keyring_import.3 APIMANS += gnutls_openpgp_keyring_init.3 APIMANS += gnutls_openpgp_privkey_deinit.3 APIMANS += gnutls_openpgp_privkey_export.3 +APIMANS += gnutls_openpgp_privkey_export2.3 APIMANS += gnutls_openpgp_privkey_export_dsa_raw.3 APIMANS += gnutls_openpgp_privkey_export_rsa_raw.3 APIMANS += gnutls_openpgp_privkey_export_subkey_dsa_raw.3 @@ -385,6 +388,7 @@ APIMANS += gnutls_pkcs11_get_pin_function.3 APIMANS += gnutls_pkcs11_init.3 APIMANS += gnutls_pkcs11_obj_deinit.3 APIMANS += gnutls_pkcs11_obj_export.3 +APIMANS += gnutls_pkcs11_obj_export2.3 APIMANS += gnutls_pkcs11_obj_export_url.3 APIMANS += gnutls_pkcs11_obj_get_info.3 APIMANS += gnutls_pkcs11_obj_get_type.3 @@ -427,6 +431,7 @@ APIMANS += gnutls_pkcs12_bag_set_friendly_name.3 APIMANS += gnutls_pkcs12_bag_set_key_id.3 APIMANS += gnutls_pkcs12_deinit.3 APIMANS += gnutls_pkcs12_export.3 +APIMANS += gnutls_pkcs12_export2.3 APIMANS += gnutls_pkcs12_generate_mac.3 APIMANS += gnutls_pkcs12_get_bag.3 APIMANS += gnutls_pkcs12_import.3 @@ -438,6 +443,7 @@ APIMANS += gnutls_pkcs7_deinit.3 APIMANS += gnutls_pkcs7_delete_crl.3 APIMANS += gnutls_pkcs7_delete_crt.3 APIMANS += gnutls_pkcs7_export.3 +APIMANS += gnutls_pkcs7_export2.3 APIMANS += gnutls_pkcs7_get_crl_count.3 APIMANS += gnutls_pkcs7_get_crl_raw.3 APIMANS += gnutls_pkcs7_get_crt_count.3 @@ -505,6 +511,7 @@ APIMANS += gnutls_psk_set_server_params_function.3 APIMANS += gnutls_pubkey_deinit.3 APIMANS += gnutls_pubkey_encrypt_data.3 APIMANS += gnutls_pubkey_export.3 +APIMANS += gnutls_pubkey_export2.3 APIMANS += gnutls_pubkey_get_key_id.3 APIMANS += gnutls_pubkey_get_key_usage.3 APIMANS += gnutls_pubkey_get_openpgp_key_id.3 @@ -520,6 +527,7 @@ APIMANS += gnutls_pubkey_import_dsa_raw.3 APIMANS += gnutls_pubkey_import_ecc_raw.3 APIMANS += gnutls_pubkey_import_ecc_x962.3 APIMANS += gnutls_pubkey_import_openpgp.3 +APIMANS += gnutls_pubkey_import_openpgp_raw.3 APIMANS += gnutls_pubkey_import_pkcs11.3 APIMANS += gnutls_pubkey_import_pkcs11_url.3 APIMANS += gnutls_pubkey_import_privkey.3 @@ -528,6 +536,7 @@ APIMANS += gnutls_pubkey_import_tpm_raw.3 APIMANS += gnutls_pubkey_import_tpm_url.3 APIMANS += gnutls_pubkey_import_url.3 APIMANS += gnutls_pubkey_import_x509.3 +APIMANS += gnutls_pubkey_import_x509_raw.3 APIMANS += gnutls_pubkey_init.3 APIMANS += gnutls_pubkey_set_key_usage.3 APIMANS += gnutls_pubkey_set_pin_function.3 @@ -603,8 +612,6 @@ APIMANS += gnutls_srp_set_prime_bits.3 APIMANS += gnutls_srp_set_server_credentials_file.3 APIMANS += gnutls_srp_set_server_credentials_function.3 APIMANS += gnutls_srp_verifier.3 -APIMANS += gnutls_status_request_ocsp_client.3 -APIMANS += gnutls_status_request_ocsp_server.3 APIMANS += gnutls_store_commitment.3 APIMANS += gnutls_store_pubkey.3 APIMANS += gnutls_strerror.3 @@ -635,6 +642,7 @@ APIMANS += gnutls_verify_stored_pubkey.3 APIMANS += gnutls_x509_crl_check_issuer.3 APIMANS += gnutls_x509_crl_deinit.3 APIMANS += gnutls_x509_crl_export.3 +APIMANS += gnutls_x509_crl_export2.3 APIMANS += gnutls_x509_crl_get_authority_key_gn_serial.3 APIMANS += gnutls_x509_crl_get_authority_key_id.3 APIMANS += gnutls_x509_crl_get_crt_count.3 @@ -670,6 +678,7 @@ APIMANS += gnutls_x509_crl_sign2.3 APIMANS += gnutls_x509_crl_verify.3 APIMANS += gnutls_x509_crq_deinit.3 APIMANS += gnutls_x509_crq_export.3 +APIMANS += gnutls_x509_crq_export2.3 APIMANS += gnutls_x509_crq_get_attribute_by_oid.3 APIMANS += gnutls_x509_crq_get_attribute_data.3 APIMANS += gnutls_x509_crq_get_attribute_info.3 @@ -715,6 +724,7 @@ APIMANS += gnutls_x509_crt_check_revocation.3 APIMANS += gnutls_x509_crt_cpy_crl_dist_points.3 APIMANS += gnutls_x509_crt_deinit.3 APIMANS += gnutls_x509_crt_export.3 +APIMANS += gnutls_x509_crt_export2.3 APIMANS += gnutls_x509_crt_get_activation_time.3 APIMANS += gnutls_x509_crt_get_authority_info_access.3 APIMANS += gnutls_x509_crt_get_authority_key_gn_serial.3 @@ -804,6 +814,7 @@ APIMANS += gnutls_x509_crt_verify_data.3 APIMANS += gnutls_x509_crt_verify_hash.3 APIMANS += gnutls_x509_dn_deinit.3 APIMANS += gnutls_x509_dn_export.3 +APIMANS += gnutls_x509_dn_export2.3 APIMANS += gnutls_x509_dn_get_rdn_ava.3 APIMANS += gnutls_x509_dn_import.3 APIMANS += gnutls_x509_dn_init.3 @@ -812,6 +823,8 @@ APIMANS += gnutls_x509_dn_oid_name.3 APIMANS += gnutls_x509_privkey_cpy.3 APIMANS += gnutls_x509_privkey_deinit.3 APIMANS += gnutls_x509_privkey_export.3 +APIMANS += gnutls_x509_privkey_export2.3 +APIMANS += gnutls_x509_privkey_export2_pkcs8.3 APIMANS += gnutls_x509_privkey_export_dsa_raw.3 APIMANS += gnutls_x509_privkey_export_ecc_raw.3 APIMANS += gnutls_x509_privkey_export_pkcs8.3 @@ -855,7 +868,7 @@ dist_man_MANS += $(APIMANS) $(APIMANS): stamp_mans compare-makefile: - FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort`; \ + FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \ MANS=""; \ for i in $$FUNCS; do \ MANS="$$MANS\nAPIMANS += $$i.3"; \ @@ -875,7 +888,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -889,7 +902,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -903,7 +916,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/libdane/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -917,7 +930,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -931,7 +944,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -945,7 +958,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -959,7 +972,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -973,7 +986,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -987,7 +1000,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -1001,7 +1014,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -1015,7 +1028,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" @@ -1029,7 +1042,7 @@ stamp_mans: $(HEADER_FILES) -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2012 Free Software Foundation, Inc." \ -function $$i \ - $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \ + $(C_SOURCE_FILES) > $$i.3 2>/dev/null && \ echo -n "."; \ done @echo "" diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 0022f7d107..b3719c9c19 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -47,15 +47,13 @@ MKHTML_OPTIONS= # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html FIXXREF_OPTIONS= +-include $(top_srcdir)/doc/doc.mk + # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/lib/includes/gnutls/*.h \ - $(top_builddir)/lib/includes/gnutls/*.h -CFILE_GLOB=$(top_srcdir)/lib/*.c \ - $(top_srcdir)/lib/x509/*.c \ - $(top_srcdir)/lib/openpgp/*.c \ - $(top_srcdir)/lib/minitasn1/*.c +HFILE_GLOB=$(HEADER_FILES) +CFILE_GLOB=$(C_SOURCE_FILES) # Extra header to include when scanning, which are not under DOC_SOURCE_DIR # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h @@ -66,100 +64,7 @@ EXTRA_HFILES= IGNORE_HFILES= # find lib -name \*.h -exec basename {} \; | grep -v -e ^abstract.h$ -e ^crypto.h$ -e ^dtls.h$ -e ^gnutls.h$ -e ^openpgp.h$ -e ^pkcs11.h$ -e ^pkcs12.h$ -e ^x509.h$ -e ^ocsp.h$ -e ^tpm.h$ | sort | uniq | sed -e 's/^/\t/' -e 's/$/ \\/' -IGNORE_HFILES += \ - abstract_int.h \ - accelerated.h \ - aes-padlock.h \ - aes-x86.h \ - algorithms.h \ - anon.h \ - cert.h \ - cert_type.h \ - common.h \ - compat.h \ - context.h \ - crypto-backend.h \ - cryptodev.h \ - debug.h \ - dh_common.h \ - ecc.h \ - ecdh_common.h \ - egd.h \ - element.h \ - filters.h \ - gnettle.h \ - gnutls_auth.h \ - gnutls_buffers.h \ - gnutls_cipher.h \ - gnutls_cipher_int.h \ - gnutls_compress.h \ - gnutls_constate.h \ - gnutls_datum.h \ - gnutls_db.h \ - gnutls_dh.h \ - gnutls_dtls.h \ - gnutls_ecc.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_mbuffers.h \ - gnutls_mem.h \ - gnutls_mpi.h \ - gnutls_num.h \ - gnutls_openpgp.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_array.h \ - gnutls_str.h \ - gnutls_supplemental.h \ - gnutls_v2_compat.h \ - gnutls_x509.h \ - gnutlsxx.h \ - gstr.h \ - hash.h \ - heartbeat.h \ - int.h \ - keydb.h \ - libtasn1.h \ - locks.h \ - main.h \ - max_record.h \ - opencdk.h \ - openpgp_int.h \ - packet.h \ - parser_aux.h \ - pbkdf2-sha1.h \ - pin.h \ - pkcs11_int.h \ - psk.h \ - psk_passwd.h \ - randomart.h \ - random.h \ - safe_renegotiation.h \ - server_name.h \ - session_ticket.h \ - sha-padlock.h \ - signature.h \ - srp.h \ - srp_passwd.h \ - stream.h \ - structure.h \ - system.h \ - types.h \ - verify-high.h \ - x509_b64.h \ - x509_int.h \ - x86.h +IGNORE_HFILES += $(top_srcdir)/lib/*.h $(top_srcdir)/lib/*/*.h $(top_srcdir)/libdane/*.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/doc/reference/gnutls-docs.sgml b/doc/reference/gnutls-docs.sgml index d22ef5e202..2dd64f1d10 100644 --- a/doc/reference/gnutls-docs.sgml +++ b/doc/reference/gnutls-docs.sgml @@ -39,6 +39,7 @@ +