diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2020-01-13 22:42:17 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2020-01-13 22:42:17 +0000 |
| commit | 0ddd79afb47149cd49690b3a89b9a8ca79acd29b (patch) | |
| tree | 31d489b262728869db18fc9aa35d77c1d1caae24 /tests/Makefile.am | |
| parent | 6dbe291c8d264ee90d16331b80b1743c2de52a15 (diff) | |
| parent | 454eb184f0c2255a9d33fbdd096906b8e18ef582 (diff) | |
| download | gnutls-0ddd79afb47149cd49690b3a89b9a8ca79acd29b.tar.gz | |
Merge branch 'override-default-priority' into 'master'
libgnutls: Add system-wide default-priority-string override.
See merge request gnutls/gnutls!1158
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 0a91ced5b2..c3c1780ad1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -71,7 +71,8 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \ testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm testpkcs11-certs/ca.crt testpkcs11-certs/ca-tmpl \ testpkcs11-certs/client.key testpkcs11-certs/server.crt testpkcs11-certs/server-tmpl \ testpkcs11-certs/ca.key testpkcs11-certs/client.crt testpkcs11-certs/client-tmpl testpkcs11-certs/server.key \ - crt_type-neg-common.c + crt_type-neg-common.c \ + system-override-default-priority-string.bad.config system-override-default-priority-string.none.config system-override-default-priority-string.only-tls13.config AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ @@ -512,7 +513,7 @@ dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh start if !DISABLE_SYSTEM_CONFIG dist_check_SCRIPTS += system-override-sig-hash.sh system-override-versions.sh system-override-invalid.sh \ system-override-curves.sh system-override-profiles.sh system-override-tls.sh \ - system-override-kx.sh + system-override-kx.sh system-override-default-priority-string.sh endif dist_check_SCRIPTS += gnutls-cli-self-signed.sh gnutls-cli-invalid-crl.sh gnutls-cli-rawpk.sh |