diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-23 12:54:17 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-23 12:54:17 +0200 |
commit | f934a60a65d54b907296ec18e6413e9ec0f4eb45 (patch) | |
tree | b10f9ac9291c2e257d363e992f977db65cc28f91 | |
parent | a57fbe264dadf0eb9960c7e28a313ff3be3c0ab4 (diff) | |
download | gnutls-f934a60a65d54b907296ec18e6413e9ec0f4eb45.tar.gz |
small changes prior to releasegnutls_3_2_5
-rw-r--r-- | NEWS | 16 | ||||
-rw-r--r-- | doc/Makefile.am | 6 | ||||
-rw-r--r-- | doc/invoke-gnutls-cli.texi | 2 | ||||
-rw-r--r-- | doc/manpages/Makefile.am | 1 | ||||
-rwxr-xr-x | doc/scripts/mytexi2latex | 1 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/cli-args.c | 2 | ||||
-rw-r--r-- | src/cli-args.h | 2 | ||||
-rw-r--r-- | src/common.c | 3 |
9 files changed, 26 insertions, 9 deletions
@@ -3,12 +3,23 @@ Copyright (C) 2000-2012 Free Software Foundation, Inc. Copyright (C) 2013 Nikos Mavrogiannopoulos See the end for copying conditions. -* Version 3.2.5 (unreleased) +* Version 3.2.5 (released 2013-10-23) ** libgnutls: Documentation and build-time fixes. ** libgnutls: Allow the generation of DH groups of less than 700 bits. +** libgnutls: Added several combinations of ciphersuites with SHA256 and SHA384 as MAC, +as well as Camellia with GCM. + +** libdane: Added interfaces to allow initialization of dane_query_t from +external DNS resolutions, and to allow direct verification of a certificate +chain against a dane_query_t. Contributed by Christian Grothoff. + +** libdane: Fixed a buffer overflow in dane_query_tlsa(). This could be +triggered by a DNS server supplying more than 4 DANE records. Report and fix +by Christian Grothoff. + ** srptool: Fixed index command line option. Patch by Attila Molnar. ** gnutls-cli: Added support for inline commands, using the @@ -17,9 +28,6 @@ See the end for copying conditions. ** certtool: pathlen constraint is now read correctly. Reported by Christoph Seitz. -** Added several combinations of ciphersuites with SHA256 and SHA384 as MAC, -as well as Camellia with GCM. - ** API and ABI modifications: gnutls_certificate_get_crt_raw: Added dane_verify_crt_raw: Added diff --git a/doc/Makefile.am b/doc/Makefile.am index 184772f4b1..0304cf677e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -574,6 +574,8 @@ 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_raw_tlsa +FUNCS += functions/dane_raw_tlsa.short FUNCS += functions/dane_state_deinit FUNCS += functions/dane_state_deinit.short FUNCS += functions/dane_state_init @@ -586,6 +588,8 @@ FUNCS += functions/dane_verification_status_print FUNCS += functions/dane_verification_status_print.short FUNCS += functions/dane_verify_crt FUNCS += functions/dane_verify_crt.short +FUNCS += functions/dane_verify_crt_raw +FUNCS += functions/dane_verify_crt_raw.short FUNCS += functions/dane_verify_session_crt FUNCS += functions/dane_verify_session_crt.short FUNCS += functions/gnutls_alert_get @@ -642,6 +646,8 @@ FUNCS += functions/gnutls_certificate_free_crls FUNCS += functions/gnutls_certificate_free_crls.short FUNCS += functions/gnutls_certificate_free_keys FUNCS += functions/gnutls_certificate_free_keys.short +FUNCS += functions/gnutls_certificate_get_crt_raw +FUNCS += functions/gnutls_certificate_get_crt_raw.short FUNCS += functions/gnutls_certificate_get_issuer FUNCS += functions/gnutls_certificate_get_issuer.short FUNCS += functions/gnutls_certificate_get_ours diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi index 3e973c9383..c4364c36f9 100644 --- a/doc/invoke-gnutls-cli.texi +++ b/doc/invoke-gnutls-cli.texi @@ -6,7 +6,7 @@ # # DO NOT EDIT THIS FILE (invoke-gnutls-cli.texi) # -# It has been AutoGen-ed October 4, 2013 at 12:51:52 PM by AutoGen 5.17 +# It has been AutoGen-ed October 23, 2013 at 12:34:45 PM by AutoGen 5.17 # From the definitions ../src/cli-args.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am index a9c71f69f9..6bd7f61991 100644 --- a/doc/manpages/Makefile.am +++ b/doc/manpages/Makefile.am @@ -117,6 +117,7 @@ APIMANS += gnutls_certificate_free_cas.3 APIMANS += gnutls_certificate_free_credentials.3 APIMANS += gnutls_certificate_free_crls.3 APIMANS += gnutls_certificate_free_keys.3 +APIMANS += gnutls_certificate_get_crt_raw.3 APIMANS += gnutls_certificate_get_issuer.3 APIMANS += gnutls_certificate_get_ours.3 APIMANS += gnutls_certificate_get_peers.3 diff --git a/doc/scripts/mytexi2latex b/doc/scripts/mytexi2latex index fe9176c52e..3f26b10f21 100755 --- a/doc/scripts/mytexi2latex +++ b/doc/scripts/mytexi2latex @@ -345,6 +345,7 @@ multitable: $line =~ s/\>/\$>\$/g; $line =~ s/\_/\\_/g; $line =~ s/\~/\\~/g; + $line =~ s/\^/\\\\textasciicircum/g; $line =~ s/\%(?!c)/\\%/g; $line =~ s/\#/\\\#/g; $line =~ s/\@-/\\-/g; diff --git a/src/Makefile.am b/src/Makefile.am index fbd57d0268..7343e30fa6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -110,7 +110,7 @@ if ENABLE_ANON BENCHMARK_SRCS = benchmark-cipher.c benchmark.c benchmark.h benchmark-tls.c gnutls_cli_SOURCES = cli.c common.h common.c \ - socket.c socket.h ocsptool-common.c \ + socket.c socket.h ocsptool-common.c inline_cmds.h \ $(BENCHMARK_SRCS) gnutls_cli_LDADD = ../lib/libgnutls.la if ENABLE_DANE diff --git a/src/cli-args.c b/src/cli-args.c index db605e3997..8b338d8f44 100644 --- a/src/cli-args.c +++ b/src/cli-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (cli-args.c) * - * It has been AutoGen-ed October 4, 2013 at 12:51:05 PM by AutoGen 5.17 + * It has been AutoGen-ed October 23, 2013 at 12:39:20 PM by AutoGen 5.17 * From the definitions cli-args.def * and the template file options * diff --git a/src/cli-args.h b/src/cli-args.h index 4e21349196..a163dcf1d8 100644 --- a/src/cli-args.h +++ b/src/cli-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (cli-args.h) * - * It has been AutoGen-ed October 4, 2013 at 12:51:05 PM by AutoGen 5.17 + * It has been AutoGen-ed October 23, 2013 at 12:39:20 PM by AutoGen 5.17 * From the definitions cli-args.def * and the template file options * diff --git a/src/common.c b/src/common.c index cdb09f6c04..fb51d5e6d5 100644 --- a/src/common.c +++ b/src/common.c @@ -991,7 +991,8 @@ pin_callback (void *user, int attempt, const char *token_url, { const char *password; const char * desc; - int len, cache = MAX_CACHE_TRIES; + int cache = MAX_CACHE_TRIES; + unsigned len; /* allow caching of PIN */ static char *cached_url = NULL; static char cached_pin[32] = ""; |