summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* pkcs11: add option to skip the duplicate modules checktmp-pkcs11-reject-duplicate-modulesDaiki Ueno2021-02-154-39/+86
| | | | | | | | | | | | The check introduced by commit 12f4abc02e718e2ab0f7ae80b3026a29028536e7 prevents the same smart card drivers being accessed from multiple drivers, but also prevents using multiple different tokens configured to be used with p11-kit's "remote:" option. This reverts that behavior but adds a new flag to opt for the check. Signed-off-by: Daiki Ueno <ueno@gnu.org>
* Merge branch 'wip/dueno/bootstrap' into 'master'Daiki Ueno2021-02-135-43/+47
|\ | | | | | | | | | | | | bootstrap: update from Gnulib Closes #1143 See merge request gnutls/gnutls!1384
| * .gitlab-ci.yml: bump cache versionDaiki Ueno2021-02-131-1/+1
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * bootstrap.conf: initialize openssl submoduleDaiki Ueno2021-02-131-1/+1
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * configure.ac: fix misleading --help output on guile bindingsDaiki Ueno2021-02-131-1/+1
| | | | | | | | | | | | | | Reported by Tim Rühsen in: https://gitlab.com/gnutls/gnutls/-/issues/577 Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * bootstrap: update from GnulibDaiki Ueno2021-02-131-9/+23
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * bootstrap.conf: refactor detection of gtk-doc and gnulib socketsDaiki Ueno2021-02-131-31/+19
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * .gitignore: ignore more filesDaiki Ueno2021-02-131-0/+2
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
* | Merge branch 'tmp-tests-missing-nettle-cflags' into 'master'Andreas Metzler2021-02-133-20/+11
|\ \ | |/ |/| | | | | Fix test error with nettle in non-default location See merge request gnutls/gnutls!1386
| * Fix test error with nettle in non-default locationAndreas Metzler2021-02-133-20/+11
|/ | | | | | | | Move #include <nettle/memxor.h> from gnutls_int.h to lib/cipher.c, drop now superfluous NETTLE_CFLAGS from CPPFLAGS of multiple tests #including gnutls_int.h. Signed-off-by: Andreas Metzler <ametzler@bebt.de>
* .gitlab-ci.yml: remove FreeBSD runDaiki Ueno2021-02-111-34/+1
| | | | | | | This used to run on a dedicated FreeBSD runner, which is no longer maintained. Signed-off-by: Daiki Ueno <ueno@gnu.org>
* Merge branch 'wip/dueno/hrr-resumption' into 'master'Daiki Ueno2021-02-1021-99/+407
|\ | | | | | | | | handshake: TLS 1.3: don't generate session ID in resumption mode See merge request gnutls/gnutls!1381
| * tests: close unused fd opened by socketpairDaiki Ueno2021-02-042-0/+4
| | | | | | | | | | | | Otherwise the tests block forever, even if the child exits. Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * .gitlab-ci.yml: remove redundant "make check" in build stageDaiki Ueno2021-02-041-1/+0
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * handshake: TLS 1.3: don't generate session ID in resumption modeDaiki Ueno2021-02-044-10/+332
| | | | | | | | | | | | | | | | | | | | | | The commit e0bb98e1f71f94691f600839ff748d3a9f469d3e revealed that the previous code always generated session ID in the TLS 1.3 middlebox compatibility mode even when the handshake is being resumed. This could cause a difference in PSK binder calculation if the server sends an HRR in the resumption handshake. Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * gnutls_session_is_resumed: don't check session ID in TLS 1.3Daiki Ueno2021-02-041-3/+3
| | | | | | | | | | | | | | | | | | | | In middlebox compatibiltiy mode, TLS 1.3 client simulates the TLS 1.2 resumption handshake, so checking session ID for resumption is pointless. This worked previously because the client always generated new random value even in a true resumption handshake, but didn't update the session parameters properly. Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * _gnutls_openpgp_send_fingerprint: remove unused declarationDaiki Ueno2021-02-041-2/+0
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * _gnutls_session_is_resumable: remove unused internal functionDaiki Ueno2021-02-042-9/+0
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * handshake: replace TRUE and FALSE with <stdbool.h>Daiki Ueno2021-02-041-13/+10
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * handshake: replace RESUME_TRUE and RESUME_FALSE with <stdbool.h>Daiki Ueno2021-02-0414-63/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having those constants could cause wrong impression that there is a third possible value. To reproduce the changes other than lib/gnutls_int.h: for i in `git ls-files lib`; do sed -i -e 's/\(session->internals.\(resumed\|resumable\)\) *\(== *RESUME_FALSE\|!= *RESUME_TRUE\)/!\1/' \ -e 's/\(session->internals.\(resumed\|resumable\)\) *\(== *RESUME_TRUE\|!= *RESUME_FALSE\)/\1/' \ -e 's/RESUME_TRUE/true/' \ -e 's/RESUME_FALSE/false/' \ $i done Signed-off-by: Daiki Ueno <ueno@gnu.org>
* | Merge branch 'wip/dueno/cli-debug' into 'master'Daiki Ueno2021-02-101-3/+1
|\ \ | | | | | | | | | | | | tests/gnutls-cli-debug.sh: don't unset system priority settings See merge request gnutls/gnutls!1387
| * | tests/gnutls-cli-debug.sh: don't unset system priority settingsDaiki Ueno2021-02-091-3/+1
|/ / | | | | | | | | | | | | | | | | | | When the test is exercised, GNUTLS_SYSTEM_PRIORITY_FILE is set in many places, such as TESTS_ENVIRONMENT tests/Makefile.am or a packaging system that runs the test in a restricted environment. Unsetting it after a temporary use forces the remaining part of the test to use the default system priority, which might not be the intention of the user. Signed-off-by: Daiki Ueno <ueno@gnu.org>
* | Merge branch 'wip/dueno/dupes' into 'master'Daiki Ueno2021-02-084-23/+245
|\ \ | | | | | | | | | | | | | | | | | | gnutls_x509_trust_list_verify_crt2: ignore duplicate certificates Closes #1131 See merge request gnutls/gnutls!1370
| * | gnutls_x509_trust_list_verify_crt2: ignore duplicate certificatesDaiki Ueno2021-02-084-23/+245
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The commit ebb19db9165fed30d73c83bab1b1b8740c132dfd caused a regression, where duplicate certificates in a certificate chain are no longer ignored but treated as a non-contiguous segment and that results in calling the issuer callback, or a verification failure. This adds a mechanism to record certificates already seen in the chain, and skip them while still allow the caller to inject missing certificates. Signed-off-by: Daiki Ueno <ueno@gnu.org> Co-authored-by: Andreas Metzler <ametzler@debian.org>
* | Merge branch 'master' into 'master'Daiki Ueno2021-02-081-85/+87
|\ \ | | | | | | | | | | | | Doc: Add missing algorithm keywords to priority string table See merge request gnutls/gnutls!1385
| * | doc: Add some missing algorithm keywords to priority string tableDosenpfand2021-02-071-85/+87
|/ / | | | | | | Signed-off-by: Markus Gasser <m@sad.bz>
* | Merge branch 'wip/dueno/parallel-openssl' into 'master'Daiki Ueno2021-02-0421-2031/+2839
|\ \ | |/ |/| | | | | | | | | tests: remove hand-written parallelism Closes #1099 See merge request gnutls/gnutls!1372
| * testcompat-openssl: run TLS 1.3 client/server tests in parallelDaiki Ueno2021-02-014-609/+673
| | | | | | | | Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * testcompat-openssl: remove hand-written parallelismDaiki Ueno2021-01-3113-972/+1610
| | | | | | | | | | | | | | | | | | | | Previously, the test used to launch multiple tests in background and then join them using shell primitives. That approach makes the test slower as it cannot benefit from the automake's parallel test harness, as well as it makes diagnostic harder because the lines in the log file mix up. Signed-off-by: Daiki Ueno <ueno@gnu.org>
| * testcompat-polarssl: remove hand-written parallelismDaiki Ueno2021-01-256-451/+557
| | | | | | | | | | | | | | | | | | | | Previously, the test used to launch multiple tests in background and then join them using shell primitives. That approach makes the test slower as it cannot benefit from the automake's parallel test harness, as well as it makes diagnostic harder because the lines in the log file mix up. Signed-off-by: Daiki Ueno <ueno@gnu.org>
* | Merge branch 'check_cert_list_argument' into 'master'Daiki Ueno2021-01-311-1/+8
|\ \ | |/ |/| | | | | Verify that cert_list_size > 0 and cert_list != NULL See merge request gnutls/gnutls!1379
| * Ensure ca_list != NULL and ca_list_size > 0.Tom Carroll2021-01-101-1/+5
| | | | | | | | | | | | | | | | As ca_list_size is used in malloc, ensure that ca_list_size > 0. If ca_list_size > 0, then ca_list cannot be NULL. Make these assumptions explicit with argument condition check. Signed-off-by: Tom Carroll <incentivedesign@gmail.com>
| * Verify that cert_list != NULL and cert_list_size > 0.Tom Carroll2021-01-101-0/+3
| | | | | | | | | | | | | | | | | | gnutls_certificate_set_x509_key() assumes that cert_list != NULL and cert_list_size > 0. These assumptions are evident as cert_list_size is used for malloc and cert_list[0] is accessed. Make those assumptions explicit with argument condition check. Signed-off-by: Tom Carroll <incentivedesign@gmail.com>
* | Merge branch 'wip/dueno/fips-dh-memleak' into 'master'Daiki Ueno2021-01-253-23/+28
|\ \ | | | | | | | | | | | | fips: avoid memleak in (EC)DH internal APIs See merge request gnutls/gnutls!1380
| * | fips: avoid memleak in (EC)DH internal APIsDaiki Ueno2021-01-223-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were some confusions of gnutls_pk_params_clear and gnutls_pk_params_release, as well as the number of parameters to scan in the gnutls_pk_params_st structure. Flagged by address sanitizer: ==354688==ERROR: LeakSanitizer: detected memory leaks Direct leak of 192 byte(s) in 12 object(s) allocated from: #0 0x7f13506163cf in __interceptor_malloc (/lib64/libasan.so.6+0xab3cf) #1 0x7f13503b94de in wrap_nettle_mpi_init /home/ueno/devel/gnutls/lib/nettle/mpi.c:79 #2 0x7ffcb8495f07 ([stack]+0x1ef07) Direct leak of 160 byte(s) in 10 object(s) allocated from: #0 0x7f13506163cf in __interceptor_malloc (/lib64/libasan.so.6+0xab3cf) #1 0x7f13503b94de in wrap_nettle_mpi_init /home/ueno/devel/gnutls/lib/nettle/mpi.c:79 Signed-off-by: Daiki Ueno <ueno@gnu.org>
* | | Merge branch 'pcert_deinit_on_cleanup' into 'master'Daiki Ueno2021-01-251-1/+5
|\ \ \ | |/ / |/| | | | | | | | gnutls_certificate_set_x509_key(): deinitialize pcerts array elements during cleanup See merge request gnutls/gnutls!1378
| * | Deinitialize pcerts array elements during cleanup.Tom Carroll2021-01-101-1/+5
|/ / | | | | | | | | | | | | In gnutls_certificate_set_x509_key() cleanup, the pcert elements should be deinitialized, freeing pcert's pubkey and cert fields. Signed-off-by: Tom Carroll <incentivedesign@gmail.com>
* | Merge branch 'no-weak' into 'master'Daiki Ueno2021-01-091-1/+18
|\ \ | |/ |/| | | | | | | | | configure: Remove -no_weak_links from LDFLAGS after detecting function availability Closes #966 See merge request gnutls/gnutls!1376
| * configure: Remove -no_weak_links from LDFLAGS after detecting function ↵Martin Storsjo2021-01-081-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | availability This reverts commit 945a48993dcdd9ead17216e55c59db209923ea5e and fixes the original issue (#966) differently. This makes sure that when targeting a version of macOS less than 10.12, we won't pick up and unconditionally use functions that only appeared later, when building with Xcode 11.4 or newer. (With Xcode 11.4 or newer, the fix from 945a48993dcdd9 caused -no_weak_links not be added, affecting the function availability tests.) Signed-off-by: Martin Storsjo <martin@martin.st>
* | Merge branch 'wip/dueno/autoconf-2.70' into 'master'Daiki Ueno2021-01-081-0/+0
|\ \ | |/ |/| | | | | | | | | gnulib: update git submodule Closes #1138 See merge request gnutls/gnutls!1374
| * gnulib: update git submoduleDaiki Ueno2020-12-291-0/+0
| | | | | | | | | | | | | | | | | | | | This brings in the fix for building with autoconf 2.70: https://lists.gnu.org/archive/html/bug-gnulib/2020-12/msg00091.html Suggested by Jan Palus in: https://gitlab.com/gnutls/gnutls/-/issues/1138 Signed-off-by: Daiki Ueno <ueno@gnu.org>
* | Merge branch 'ci-rework' into 'master'Daiki Ueno2021-01-081-742/+746
|\ \ | | | | | | | | | | | | CI pipeline rework - using stages and inheritance See merge request gnutls/gnutls!1366
| * | CI pipeline rework - using stages and inheritanceStanislav Zidek2020-12-011-742/+746
| | | | | | | | | | | | Signed-off-by: Stanislav Zidek <szidek@redhat.com>
* | | Merge branch 'github-macos' into 'master'Airtower2021-01-084-52/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Github Actions for MacOS CI Closes #1140 See merge request gnutls/gnutls!1375
| * | | Update year of copyright notices in doc/gnutls.texiFiona Klute2021-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Static analysis in CI checks if this is up to date, and fails if not. This fixes the failure. Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
| * | | Update CI documentation for use of Github ActionsFiona Klute2021-01-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
| * | | Remove Travis CI configurationFiona Klute2021-01-021-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced by Github Actions workflow added in 9fc73ec96fa5adfc8e9a4bd2ee9e6543ffcfe120. Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
| * | | Github Actions job for MacOS CIFiona Klute2021-01-021-0/+43
| | |/ | |/| | | | | | | Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
* | | Merge branch 'tmp-limit-gnutls-openssl-exported-symbols' into 'master'Andreas Metzler2020-12-301-1/+2
|\ \ \ | |/ / |/| | | | | | | | libgnutls-openssl: Clean up list of exported symbols See merge request gnutls/gnutls!1373
| * | libgnutls-openssl: Clean up list of exported symbolsAndreas Metzler2020-12-291-1/+2
| | | | | | | | | | | | Signed-off-by: Andreas Metzler <ametzler@bebt.de>