Merge branch 'tmp-fix-ci-runs' into 'master'

This fixes the recent issue with openssl interop testing in CI

See merge request gnutls/gnutls!798

testcompat-openssl: do not test DSS or small curves with 1.1.1

DSA uses 1024-bit parameters, and these together with curves of
less than 256 bits are not accepted by debian's openssl.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

doc/credentials: increased key size in RSA client cert

This is used by the test suite and recent openssl in debian requires
a larger certificates.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

certtool: allow --update-certificate to replace public key

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

README.md: updated instructions to apply to fedora29

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

Merge branch 'tmp-ignore-ctypes' into 'master'

gnutls_priority_init: ignore CTYPE-OPENPGP options

Closes #593

See merge request gnutls/gnutls!789

Merge branch 'tmp-fix-record-size-limit-tls12' into 'master'

ext/record_size_limit: handle the extension in TLS 1.2 ServerHello

Closes #599

See merge request gnutls/gnutls!791

Merge branch 'ajuaristi-update-docs' into 'master'

Update docs for session ticket key rotation

Closes #581

See merge request gnutls/gnutls!768

Update docs for session ticket key rotation [ci skip]

Fix #581.

Signed-off-by: Ander Juaristi <a@juaristi.eus>

ext/record_size_limit: handle the extension in TLS 1.2 ServerHello

Previously it had assumed that TLS 1.2 servers don't send the
extension, while actually it can be present in ServerHello.

Signed-off-by: Daiki Ueno <dueno@redhat.com>

gnutls_priority_init: ignore CTYPE-OPENPGP options

In GnuTLS 3.6.0 we dropped support for openpgp keys, however
the CTYPE-OPENPGP is often seen in applications, sometimes
as -CTYPE-OPENPGP to ensure it is not enabled. We simply
ignore this priority string when seen, to avoid preventing
these applications from running.

Resolves #593

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

gnutls_priority_init: fixed indentation according to project rules

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

Merge branch 'tmp-fix-priority-set' into 'master'

gnutls_priority_set: do not override the version after handshake is complete

See merge request gnutls/gnutls!777

gnutls_priority_set: re-organized

The sanity tests we moved prior to setting these priorities
and the %GNUTLS_E_NO_PRIORITIES_WERE_SET error code is returned
consistently to indicate that the existing priorities were not
overwritten.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

gnutls_priority_set: do not override the version after handshake is complete

When an application would re-set priorities prior to a rehandshake
we would override the negotiated version with the highest supported,
something which may lead to issues. This disables that unnecessary
version override. See:

https://bugzilla.redhat.com/show_bug.cgi?id=1634736

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

gnutls-serv: use default priorities when none are given

This makes it in par with gnutls-cli.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

Merge branch 'tmp-cli-reduce-output' into 'master'

gnutls-cli: reduce printed session information

See merge request gnutls/gnutls!784

Merge branch 'gost-selfcheck' into 'master'

self-tests: add GOST public key tests

Closes #492

See merge request gnutls/gnutls!788

self-tests: add GOST public key tests

Test vectors provided in standard are not that usefull (they use
unsupported curves with a != -3), so these test vectors were generated
by hand.

Fixes #492

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

NEWS: added CMAC entries [ci skip]

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

Merge branch 'cmac' into 'master'

Add support for AES CMAC mac

Closes #351

See merge request gnutls/gnutls!786

Add NEWS entry about AES-CMAC

Signed-off-by: Simo Sorce <simo@redhat.com>

Add selftests for CMAC

Signed-off-by: Simo Sorce <simo@redhat.com>

Vendor in CMAC functionality from Nettle

If nettle's CMAC is not available, use a vendored in version from master.
This is necessary as long as we need to link against 3.4 for ABI
compatibility reasons.

Signed-off-by: Simo Sorce <simo@redhat.com>

Add CMAC Support

Signed-off-by: Simo Sorce <simo@redhat.com>

Merge branch 'gost-selfcheck' into 'master'

Selftests for symmetric GOST algorithms

See merge request gnutls/gnutls!787

NEWS: Add entry mentioning fix of S-BOXes for CryptoPro-B,-C,-D variants

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

self-tests: add GOST symmetric algorithms tests

Add tests for:
 - GOST 28147-89 CFB cipher
 - GOST R 34.11-94 hash function
 - Streebog-256/-512 hash functions
 - HMAC using GOST R 34.11-94/Streebog functions

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

nettle: fix s-boxes selection for rare GOST 28147-89 variants

gost28147-89 code contained c&p error, which resulted in using S-BOX
CryptoPro-A instead of -B, -C, -D. Fix that.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

doc update [ci skip]

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

Merge branch 'cfb8' into 'master'

Add support for AES CFB8 cipher

Closes #357

See merge request gnutls/gnutls!783

Merge branch 'tmp-session-ticket-timestamp' into 'master'

TLS 1.3: calculate ticket age based on higher precision time

See merge request gnutls/gnutls!785

ext/pre_shared_key: don't assume ob_ticket_age < ticket_age_add

Previously, the server treated the condition as error, while it is
possible that ob_ticket_age may have wrapped round by 2^32.

Signed-off-by: Daiki Ueno <dueno@redhat.com>

tls13/session_ticket: calculate ticket_age in milliseconds

Previously we calculated ticket age from the current wall clock in
seconds, multiplying by 1000.  This is conceptually wrong, because
ticket age is designed to be in milliseconds.

Signed-off-by: Daiki Ueno <dueno@redhat.com>

str: add macros to encode/decode struct timespec value

Signed-off-by: Daiki Ueno <dueno@redhat.com>

system: provide a means to replace gettime implementation

While gettime() is extensively used in the code, the library
previously hadn't provided a way to replace it for testing.  This adds
a new internal function _gnutls_global_set_gettime_function and makes
use of it through virt-time.h.

Signed-off-by: Daiki Ueno <dueno@redhat.com>

Add selftest for CFB8

_gnutls_timespec_cmp: new inline function

Signed-off-by: Daiki Ueno <dueno@redhat.com>

tls13/session_ticket: rename tls13_ticket_t type to tls13_ticket_st

This is consistent with the coding guideline.

Signed-off-by: Daiki Ueno <dueno@redhat.com>

gnutls-cli: reduce printed session information

When connecting to a server we were printing a lot of duplicate
information that was already part of the "Description" string.
No longer print that information unless --verbose is given.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

gnutls-cli: do not print errors twice

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

Vendor in CFB8 functionality from Nettle

If nettle's CFB8 is not available, use a vendored in version from master.
This is necessary as long as we need to link against 3.4 for ABI
compatibility reasons.

Signed-off-by: Simo Sorce <simo@redhat.com>

Add AES-CFB8 Support

Signed-off-by: Simo Sorce <simo@redhat.com>

Merge branch 'tmp-fix-fips-mode' into 'master'

fips140: aligned code with documentation

See merge request gnutls/gnutls!781

Merge branch 'tmp-initialize-so-pin-fix' into 'master'

p11tool: fix admin user PIN initialization

Closes #561

See merge request gnutls/gnutls!776

p11tool: fix initialization of security officer's PIN

Previously we would call gnutls_pkcs11_token_set_pin() without an
old PIN provided, which will result to the use of C_InitPIN() on the
underlying module. The C_InitPIN() in contrast with C_SetPIN() will
only work for the user and not for the administrator. As such, we
always provide the oldpin for when we change the admin's PIN.

Resolves #561

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

fips140: aligned code with documentation

That is, we introduce the documented but unimplemented macros
GNUTLS_FIPS140_SET_LAX_MODE() and GNUTLS_FIPS140_SET_STRICT_MODE().

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

Merge branch 'tmp_cleanup_and_fixes' into 'master'

Cleanup and fixes

Closes #453

See merge request gnutls/gnutls!779

Simplified check for NULL pointer to reduce code changes.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Unified abbreviation for certificate type priorities in code.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Merge branch 'tmp-update-tlsfuzzer' into 'master'

update tlsfuzzer scripts to latest version

Closes #591

See merge request gnutls/gnutls!774

Renamed CHECK_AUTH macro to CHECK_AUTH_TYPE to be more clear what it checks.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Renamed _gnutls_server_select_cert() to _gnutls_select_server_cert() for consistency reasons with its client couterpart.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Renamed certificate_credential_append_crt_list() to certificate_credential_append_keypair().

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Renamed _gnutls_auth_info_set() to _gnutls_auth_info_init().

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Renamed fields in priority_st to improve code readability. Fixes #453.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Added NULL pointer check in gnutls_certificate_free_credentials for safety.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Renamed _gnutls_proc_x509_server_crt to _gnutls_proc_x509_crt.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Small fixes for comments and log strings.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

Merge branch 'tmp-uris' into 'master'

pkcs11 uris: the scheme is case insensitive

Closes #590

See merge request gnutls/gnutls!616

Merge branch 'tmp-fix-global-init-override' into 'master'

SKIP tests/global-init-override if weak symbols don't work

Closes #592

See merge request gnutls/gnutls!778

SKIP tests/global-init-override if weak symbols don't work

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

tests: eagain-auto-auth: only compiled in systems with cmocka available

This fixes build issue at MacOSX CI.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

tlsfuzzer: updated to latest upstream and enabled new tests

Resolves: #591

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

handshake: send missing extension alert

When a key share extension is not seen under TLS1.3, send
the missing extension alert.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

Merge branch 'tmp-auto-reauth' into 'master'

gnutls_init: added flag for automatic re-authentication

Closes #571

See merge request gnutls/gnutls!766

_gnutls_server_select_cert: return error when no server cert is selected

When a certificate callback is used and no certificate is provided
by it, return an error rather than trying to use it (and crashing)
later. Note that this affects only an "illegal" code path when
a server would have provided no certificate, something which must
not happen on a real-world server.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

gnutls_init: added flag for automatic re-authentication

This introduces the GNUTLS_AUTO_REAUTH gnutls_init() flag and makes
re-authentication under TLS simpler to enable and use.

Resolves #571

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

pkcs11 uris: the URI scheme is case insensitive

Makes the comparisons of the URI scheme to use c_strcasecmp
from gnulib. It also replaces various straw strcasecmp with
the gnulib variant. This ensures that comparison will be
reliable irrespective of the locale.

Resolves #590

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

.gitlab-ci.yml: cross CI requires privileged systems

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

Merge branch 'tmp-fix-eina-cpu-on-solaris' into 'master'

Fix check for GNU C compiler in eina_cpu.c

See merge request gnutls/gnutls!772

Merge branch 'tmp-fix-gen-mech-list-on-solaris' into 'master'

Fix gen-mech-list.sh on Solaris / Bourne Shell

See merge request gnutls/gnutls!771

Fix check for GNU C compiler in eina_cpu.c

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

Fix gen-mech-list.sh on Solaris / Bourne Shell

`cmd` is more compatible than $(cmd).

The shell is "sh (Schily Bourne Shell) version 2013/01/14 a+ (i386-pc-solaris2.9)"

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

Merge branch 'tmp-check-prereqs' into 'master'

Let bootstrap check for gperf, makeinfo, rsync, autopoint

Closes #582

See merge request gnutls/gnutls!769

Merge branch 'tmp-fix-584' into 'master'

Skip tests/tls13/prf.c if visibility 'protected' doesn't work

Closes #584

See merge request gnutls/gnutls!770

Let bootstrap check for gperf and autopoint

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

Skip tests/tls13/prf.c if visibility 'protected' doesn't work

Overriding gnutls_rnd() with visibility 'protected' doesn't always work.
E.g. LDFLAGS="-Wl,-Bsymbolic-functions" seems to have priority on
Debian derived systems.

Fixes #584

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

tests: added unit test for gnutls_session_set_id

This adds a unit and a negative test which ensures that
a client will not be tricked in performing resumption when
this function is used.

Resolves #585

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

doc: fix use of gnutls_ext_raw_parse callback [ci skip]

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

Merge branch 'tmp-fix-priority-set-call' into 'master'

gnutls_priority_set: do not override version on handshake

Closes #580

See merge request gnutls/gnutls!765

gnutls_priority_set: do not override version on handshake

When handshake is in progress, do not override the default TLS
version in the session. This allows gnutls_priority_set to be called
in the post_client_hello function without breaking the handshake.

Resolves #580

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

Merge branch 'tmp-check-iv-size' into 'master'

encrypt_packet_tls13: added explicit check on iv_size bounds

See merge request gnutls/gnutls!767

encrypt_packet_tls13: added explicit check on iv_size bounds

Although there are no ciphers defined for TLS1.3 which would overflow
the assumed bound, an explicit check is necessary to avoid that code
be a liability in future updates.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

privkey_pkcs8: added reference for validation parameters OID [ci skip]

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

NEWS: corrected typo [ci skip]

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

Merge branch 'tmp-lib-c-strcase' into 'master'

Use ASCII version of strcasecmp() in library code

Closes #570

See merge request gnutls/gnutls!764

Merge branch 'tlsfuzzer-ssl3' into 'master'

tlsfuzzer: add missing script

See merge request gnutls/gnutls!759

Merge branch 'tmp-fix-buffer-t' into 'master'

Make tlsproxy/buffer.c compilable by gcc 4.4.7

Closes #577

See merge request gnutls/gnutls!763

Merge branch 'tmp-cleanup-in-docs' into 'master'

manpage generation cleanup

See merge request gnutls/gnutls!760

Use ASCII version of strcasecmp() in library code

strcasecmp() has side effects in some locales.
What we really need is c_strcasecmp() from Gnulib for comparing
ASCII strings.

Fixes #570

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

.gitlab-ci.yml: reenable SSLv2 hello support for SSL-3.0.Fedora.x86_64

Reenable SSLv2 hello support to let several SSL-3.0 tls-fuzzer tests
pass.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

tlsfuzzer: disable SSL3.0 in export-ciphers-rejected test

These tests will fail with SSL3.0-enabled gnutls-serv unless --ssl3
option was passed. We will run these tests anyway from
gnutls-nocert-ssl3.json, so disable them here.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

tlsfuzzer: support running from separate build dir

Adapt tls-fuzzer-common.sh script to be able to run tests in case
srcdir != builddir.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

.gitlab-ci.yml: reenable full test suite in SSL-3.0/SHA-1 case

Reenable full test suite run in SSL-3.0/SHA-1 CI test case to let us
catch issues in legacy code.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

tlsfuzzer: add missing script

Makefile.am refers tls-fuzzer-nocert-ssl3.sh script, which is missing
in the source tree. Add it back.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

tlsfuzzer: move common code to separate file

Move common code to tls-fuzzer-common.sh to ease further adjustments.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

tlsfuzzer: use random port for tls-fuzzer-nocert test

Like the rest of tls-fuzzer tests, pass "-p PORT" to subtests, allowing
usage of random port for server.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

tlsfuzzer: use random port for tls-fuzzer-cert test

Like the rest of tls-fuzzer tests, pass "-p PORT" to subtests, allowing
usage of random port for server.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Merge branch 'tmp-eliminate-dead-code' into 'master'

_gnutls_check_key_purpose: eliminated dead code

Closes #573

See merge request gnutls/gnutls!762