diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-03-05 12:22:56 +0000 |
|---|---|---|
| committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-03-05 12:22:56 +0000 |
| commit | 80295b4962dd2eadd0f91a7864c11bac469a5135 (patch) | |
| tree | 1f97a529d36566cdbc37265aef5a8f1374e2130e /tests/Makefile.am | |
| parent | cadf85bfbe58a7557416f42af6c054fec9e1f9e5 (diff) | |
| parent | e6d9cb28fc1d82e97b9f65cde8e642645d6e9ed5 (diff) | |
| download | gnutls-80295b4962dd2eadd0f91a7864c11bac469a5135.tar.gz | |
Merge branch 'tmp-fix-cli-starttls-xmpp' into 'master'
gnutls-cli: Fix --starttls-proto=xmpp
Closes #697
See merge request gnutls/gnutls!911
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index bc01e25fb5..d039afc9e0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,7 +41,7 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \ certs/ed25519.pem certs/cert-ed25519.pem \ system.prio pkcs11/softhsm.h pkcs11/pkcs11-pubkey-import.c gnutls-asan.supp \ rsa-md5-collision/README safe-renegotiation/README starttls-smtp.txt starttls-ftp.txt \ - starttls-lmtp.txt starttls-pop3.txt starttls-nntp.txt starttls-sieve.txt \ + starttls-lmtp.txt starttls-pop3.txt starttls-xmpp.txt starttls-nntp.txt starttls-sieve.txt \ rsa-md5-collision/colliding-chain-md5-2.pem rsa-md5-collision/colliding-chain-md5-1.pem \ ocsp-tests/certs/ocsp-amazon.com.der ocsp-tests/certs/chain-amazon.com.pem \ ocsp-tests/certs/chain-amazon.com-unsorted.pem cipher-neg-common.c \ @@ -462,7 +462,7 @@ dtls_stress_LDADD = $(COMMON_GNUTLS_LDADD) \ $(COMMON_DEPS_LDADD) dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh starttls-smtp.sh \ - starttls-lmtp.sh starttls-pop3.sh starttls-nntp.sh starttls-sieve.sh \ + starttls-lmtp.sh starttls-pop3.sh starttls-xmpp.sh starttls-nntp.sh starttls-sieve.sh \ ocsp-tests/ocsp-tls-connection ocsp-tests/ocsp-must-staple-connection \ ocsp-tests/ocsp-test cipher-listings.sh sni-hostname.sh server-multi-keys.sh \ psktool.sh ocsp-tests/ocsp-load-chain gnutls-cli-save-data.sh gnutls-cli-debug.sh \ |