summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--doc/Makefile.am8
-rw-r--r--doc/manpages/Makefile.am4
-rw-r--r--symbols.last7
4 files changed, 19 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 557dd2538c..041282f91f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Copyright (C) 2000-2016 Free Software Foundation, Inc.
Copyright (C) 2013-2016 Nikos Mavrogiannopoulos
See the end for copying conditions.
-* Version 3.3.26 (unreleased)
+* Version 3.3.26 (released 2016-01-09)
** libgnutls: Handle status request responses as optional (following
RFC6066). This improves compatibility with implementations not sending
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3cf4a8a285..e531e061ac 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1268,8 +1268,12 @@ FUNCS += functions/gnutls_pkcs11_copy_secret_key
FUNCS += functions/gnutls_pkcs11_copy_secret_key.short
FUNCS += functions/gnutls_pkcs11_copy_x509_crt
FUNCS += functions/gnutls_pkcs11_copy_x509_crt.short
+FUNCS += functions/gnutls_pkcs11_copy_x509_crt2
+FUNCS += functions/gnutls_pkcs11_copy_x509_crt2.short
FUNCS += functions/gnutls_pkcs11_copy_x509_privkey
FUNCS += functions/gnutls_pkcs11_copy_x509_privkey.short
+FUNCS += functions/gnutls_pkcs11_copy_x509_privkey2
+FUNCS += functions/gnutls_pkcs11_copy_x509_privkey2.short
FUNCS += functions/gnutls_pkcs11_crt_is_known
FUNCS += functions/gnutls_pkcs11_crt_is_known.short
FUNCS += functions/gnutls_pkcs11_deinit
@@ -1310,6 +1314,8 @@ FUNCS += functions/gnutls_pkcs11_obj_list_import_url
FUNCS += functions/gnutls_pkcs11_obj_list_import_url.short
FUNCS += functions/gnutls_pkcs11_obj_list_import_url2
FUNCS += functions/gnutls_pkcs11_obj_list_import_url2.short
+FUNCS += functions/gnutls_pkcs11_obj_set_info
+FUNCS += functions/gnutls_pkcs11_obj_set_info.short
FUNCS += functions/gnutls_pkcs11_obj_set_pin_function
FUNCS += functions/gnutls_pkcs11_obj_set_pin_function.short
FUNCS += functions/gnutls_pkcs11_privkey_deinit
@@ -1322,6 +1328,8 @@ FUNCS += functions/gnutls_pkcs11_privkey_generate
FUNCS += functions/gnutls_pkcs11_privkey_generate.short
FUNCS += functions/gnutls_pkcs11_privkey_generate2
FUNCS += functions/gnutls_pkcs11_privkey_generate2.short
+FUNCS += functions/gnutls_pkcs11_privkey_generate3
+FUNCS += functions/gnutls_pkcs11_privkey_generate3.short
FUNCS += functions/gnutls_pkcs11_privkey_get_info
FUNCS += functions/gnutls_pkcs11_privkey_get_info.short
FUNCS += functions/gnutls_pkcs11_privkey_get_pk_algorithm
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 1cb99c4920..8aff96eeca 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -426,7 +426,9 @@ APIMANS += gnutls_pk_bits_to_sec_param.3
APIMANS += gnutls_pkcs11_add_provider.3
APIMANS += gnutls_pkcs11_copy_secret_key.3
APIMANS += gnutls_pkcs11_copy_x509_crt.3
+APIMANS += gnutls_pkcs11_copy_x509_crt2.3
APIMANS += gnutls_pkcs11_copy_x509_privkey.3
+APIMANS += gnutls_pkcs11_copy_x509_privkey2.3
APIMANS += gnutls_pkcs11_crt_is_known.3
APIMANS += gnutls_pkcs11_deinit.3
APIMANS += gnutls_pkcs11_delete_url.3
@@ -447,12 +449,14 @@ APIMANS += gnutls_pkcs11_obj_import_url.3
APIMANS += gnutls_pkcs11_obj_init.3
APIMANS += gnutls_pkcs11_obj_list_import_url.3
APIMANS += gnutls_pkcs11_obj_list_import_url2.3
+APIMANS += gnutls_pkcs11_obj_set_info.3
APIMANS += gnutls_pkcs11_obj_set_pin_function.3
APIMANS += gnutls_pkcs11_privkey_deinit.3
APIMANS += gnutls_pkcs11_privkey_export_pubkey.3
APIMANS += gnutls_pkcs11_privkey_export_url.3
APIMANS += gnutls_pkcs11_privkey_generate.3
APIMANS += gnutls_pkcs11_privkey_generate2.3
+APIMANS += gnutls_pkcs11_privkey_generate3.3
APIMANS += gnutls_pkcs11_privkey_get_info.3
APIMANS += gnutls_pkcs11_privkey_get_pk_algorithm.3
APIMANS += gnutls_pkcs11_privkey_import_url.3
diff --git a/symbols.last b/symbols.last
index 7d127e326f..b5b46786c9 100644
--- a/symbols.last
+++ b/symbols.last
@@ -1,5 +1,4 @@
@
-@.init
GNUTLS_1_4@GNUTLS_1_4
GNUTLS_2_10@GNUTLS_2_10
GNUTLS_2_12@GNUTLS_2_12
@@ -346,7 +345,9 @@ gnutls_pk_list@GNUTLS_1_4
gnutls_pk_to_sign@GNUTLS_3_0_0
gnutls_pkcs11_add_provider@GNUTLS_2_12
gnutls_pkcs11_copy_secret_key@GNUTLS_2_12
+gnutls_pkcs11_copy_x509_crt2@GNUTLS_3_1_0
gnutls_pkcs11_copy_x509_crt@GNUTLS_2_12
+gnutls_pkcs11_copy_x509_privkey2@GNUTLS_3_1_0
gnutls_pkcs11_copy_x509_privkey@GNUTLS_2_12
gnutls_pkcs11_crt_is_known@GNUTLS_3_1_0
gnutls_pkcs11_deinit@GNUTLS_2_12
@@ -368,11 +369,13 @@ gnutls_pkcs11_obj_import_url@GNUTLS_2_12
gnutls_pkcs11_obj_init@GNUTLS_2_12
gnutls_pkcs11_obj_list_import_url2@GNUTLS_3_1_0
gnutls_pkcs11_obj_list_import_url@GNUTLS_2_12
+gnutls_pkcs11_obj_set_info@GNUTLS_3_1_0
gnutls_pkcs11_obj_set_pin_function@GNUTLS_3_1_0
gnutls_pkcs11_privkey_deinit@GNUTLS_2_12
gnutls_pkcs11_privkey_export_pubkey@GNUTLS_3_1_0
gnutls_pkcs11_privkey_export_url@GNUTLS_2_12
gnutls_pkcs11_privkey_generate2@GNUTLS_3_1_0
+gnutls_pkcs11_privkey_generate3@GNUTLS_3_1_0
gnutls_pkcs11_privkey_generate@GNUTLS_3_0_0
gnutls_pkcs11_privkey_get_info@GNUTLS_2_12
gnutls_pkcs11_privkey_get_pk_algorithm@GNUTLS_2_12
@@ -865,6 +868,7 @@ gnutls_x509_crt_set_extension_by_oid@GNUTLS_1_4
gnutls_x509_crt_set_issuer_alt_name@GNUTLS_3_1_0
gnutls_x509_crt_set_issuer_dn@GNUTLS_3_1_0
gnutls_x509_crt_set_issuer_dn_by_oid@GNUTLS_1_4
+gnutls_x509_crt_set_issuer_unique_id@GNUTLS_3_1_0
gnutls_x509_crt_set_key@GNUTLS_1_4
gnutls_x509_crt_set_key_purpose_oid@GNUTLS_1_4
gnutls_x509_crt_set_key_usage@GNUTLS_1_4
@@ -879,6 +883,7 @@ gnutls_x509_crt_set_serial@GNUTLS_1_4
gnutls_x509_crt_set_subject_alt_name@GNUTLS_1_4
gnutls_x509_crt_set_subject_alternative_name@GNUTLS_1_4
gnutls_x509_crt_set_subject_key_id@GNUTLS_1_4
+gnutls_x509_crt_set_subject_unique_id@GNUTLS_3_1_0
gnutls_x509_crt_set_version@GNUTLS_1_4
gnutls_x509_crt_sign2@GNUTLS_1_4
gnutls_x509_crt_sign@GNUTLS_1_4