forked from pool/gnutls
f8b3d1676a
- Temporarily disable failing psk-file test (race condition) * add disable-psk-file-test.patch - Version update to 3.6.4 (bsc#1111757): OBS-URL: https://build.opensuse.org/request/show/642092 OBS-URL: https://build.opensuse.org/package/show/security:tls/gnutls?expand=0&rev=12
108 lines
5.6 KiB
Diff
108 lines
5.6 KiB
Diff
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
|
index 07433e0..4ecd431 100644
|
|
--- a/tests/Makefile.in
|
|
+++ b/tests/Makefile.in
|
|
@@ -457,7 +457,7 @@ am__EXEEXT_10 = tls13/supported_versions$(EXEEXT) \
|
|
pkcs7-gen$(EXEEXT) dtls-etm$(EXEEXT) \
|
|
x509sign-verify-rsa$(EXEEXT) x509sign-verify-ecdsa$(EXEEXT) \
|
|
x509sign-verify-gost$(EXEEXT) mini-alignment$(EXEEXT) \
|
|
- oids$(EXEEXT) atfork$(EXEEXT) prf$(EXEEXT) psk-file$(EXEEXT) \
|
|
+ oids$(EXEEXT) atfork$(EXEEXT) prf$(EXEEXT) \
|
|
priority-init2$(EXEEXT) status-request$(EXEEXT) \
|
|
status-request-ok$(EXEEXT) status-request-missing$(EXEEXT) \
|
|
sign-verify-ext$(EXEEXT) fallback-scsv$(EXEEXT) \
|
|
@@ -1590,8 +1590,6 @@ privkey_verify_broken_OBJECTS = privkey-verify-broken.$(OBJEXT)
|
|
privkey_verify_broken_LDADD = $(LDADD)
|
|
privkey_verify_broken_DEPENDENCIES = $(COMMON_GNUTLS_LDADD) \
|
|
libutils.la $(am__DEPENDENCIES_2)
|
|
-psk_file_SOURCES = psk-file.c
|
|
-psk_file_OBJECTS = psk-file.$(OBJEXT)
|
|
psk_file_LDADD = $(LDADD)
|
|
psk_file_DEPENDENCIES = $(COMMON_GNUTLS_LDADD) libutils.la \
|
|
$(am__DEPENDENCIES_2)
|
|
@@ -2723,7 +2721,7 @@ am__depfiles_remade = ./$(DEPDIR)/alerts.Po \
|
|
./$(DEPDIR)/priority-init2.Po ./$(DEPDIR)/priority-mix.Po \
|
|
./$(DEPDIR)/priority-set.Po ./$(DEPDIR)/priority-set2.Po \
|
|
./$(DEPDIR)/privkey-keygen.Po \
|
|
- ./$(DEPDIR)/privkey-verify-broken.Po ./$(DEPDIR)/psk-file.Po \
|
|
+ ./$(DEPDIR)/privkey-verify-broken.Po \
|
|
./$(DEPDIR)/pskself.Po ./$(DEPDIR)/pubkey-import-export.Po \
|
|
./$(DEPDIR)/random-art.Po ./$(DEPDIR)/record-pad.Po \
|
|
./$(DEPDIR)/record-retvals.Po \
|
|
@@ -3021,7 +3019,7 @@ SOURCES = $(libpkcs11mock1_la_SOURCES) $(libutils_la_SOURCES) alerts.c \
|
|
pkcs7-gen.c pkcs8-key-decode.c pkcs8-key-decode-encrypted.c \
|
|
prf.c priorities.c priorities-groups.c priority-init2.c \
|
|
priority-mix.c priority-set.c priority-set2.c privkey-keygen.c \
|
|
- privkey-verify-broken.c psk-file.c pskself.c \
|
|
+ privkey-verify-broken.c pskself.c \
|
|
pubkey-import-export.c random-art.c record-pad.c \
|
|
record-retvals.c record-sizes.c record-sizes-range.c \
|
|
record-timeouts.c recv-data-before-handshake.c \
|
|
@@ -3183,7 +3181,7 @@ DIST_SOURCES = $(am__libpkcs11mock1_la_SOURCES_DIST) \
|
|
pkcs7-gen.c pkcs8-key-decode.c pkcs8-key-decode-encrypted.c \
|
|
prf.c priorities.c priorities-groups.c priority-init2.c \
|
|
priority-mix.c priority-set.c priority-set2.c privkey-keygen.c \
|
|
- privkey-verify-broken.c psk-file.c pskself.c \
|
|
+ privkey-verify-broken.c pskself.c \
|
|
pubkey-import-export.c random-art.c record-pad.c \
|
|
record-retvals.c record-sizes.c record-sizes-range.c \
|
|
record-timeouts.c recv-data-before-handshake.c \
|
|
@@ -4734,7 +4732,7 @@ ctests = tls13/supported_versions tls13/tls12-no-tls13-exts \
|
|
x509-cert-callback-ocsp gnutls_ocsp_resp_list_import2 \
|
|
server-sign-md5-rep privkey-keygen mini-tls-nonblock no-signal \
|
|
pkcs7-gen dtls-etm x509sign-verify-rsa x509sign-verify-ecdsa \
|
|
- x509sign-verify-gost mini-alignment oids atfork prf psk-file \
|
|
+ x509sign-verify-gost mini-alignment oids atfork prf \
|
|
priority-init2 status-request status-request-ok \
|
|
status-request-missing sign-verify-ext fallback-scsv \
|
|
pkcs8-key-decode urls dtls-rehandshake-cert key-usage-rsa \
|
|
@@ -5872,10 +5870,6 @@ privkey-verify-broken$(EXEEXT): $(privkey_verify_broken_OBJECTS) $(privkey_verif
|
|
@rm -f privkey-verify-broken$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(privkey_verify_broken_OBJECTS) $(privkey_verify_broken_LDADD) $(LIBS)
|
|
|
|
-psk-file$(EXEEXT): $(psk_file_OBJECTS) $(psk_file_DEPENDENCIES) $(EXTRA_psk_file_DEPENDENCIES)
|
|
- @rm -f psk-file$(EXEEXT)
|
|
- $(AM_V_CCLD)$(LINK) $(psk_file_OBJECTS) $(psk_file_LDADD) $(LIBS)
|
|
-
|
|
pskself$(EXEEXT): $(pskself_OBJECTS) $(pskself_DEPENDENCIES) $(EXTRA_pskself_DEPENDENCIES)
|
|
@rm -f pskself$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(pskself_OBJECTS) $(pskself_LDADD) $(LIBS)
|
|
@@ -6862,7 +6856,6 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/priority-set2.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privkey-keygen.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privkey-verify-broken.Po@am__quote@ # am--include-marker
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psk-file.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pskself.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubkey-import-export.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random-art.Po@am__quote@ # am--include-marker
|
|
@@ -8913,13 +8906,6 @@ prf.log: prf$(EXEEXT)
|
|
--log-file $$b.log --trs-file $$b.trs \
|
|
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
|
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
|
-psk-file.log: psk-file$(EXEEXT)
|
|
- @p='psk-file$(EXEEXT)'; \
|
|
- b='psk-file'; \
|
|
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
|
- --log-file $$b.log --trs-file $$b.trs \
|
|
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
|
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
|
priority-init2.log: priority-init2$(EXEEXT)
|
|
@p='priority-init2$(EXEEXT)'; \
|
|
b='priority-init2'; \
|
|
@@ -10883,7 +10869,6 @@ distclean: distclean-recursive
|
|
-rm -f ./$(DEPDIR)/priority-set2.Po
|
|
-rm -f ./$(DEPDIR)/privkey-keygen.Po
|
|
-rm -f ./$(DEPDIR)/privkey-verify-broken.Po
|
|
- -rm -f ./$(DEPDIR)/psk-file.Po
|
|
-rm -f ./$(DEPDIR)/pskself.Po
|
|
-rm -f ./$(DEPDIR)/pubkey-import-export.Po
|
|
-rm -f ./$(DEPDIR)/random-art.Po
|
|
@@ -11318,7 +11303,6 @@ maintainer-clean: maintainer-clean-recursive
|
|
-rm -f ./$(DEPDIR)/priority-set2.Po
|
|
-rm -f ./$(DEPDIR)/privkey-keygen.Po
|
|
-rm -f ./$(DEPDIR)/privkey-verify-broken.Po
|
|
- -rm -f ./$(DEPDIR)/psk-file.Po
|
|
-rm -f ./$(DEPDIR)/pskself.Po
|
|
-rm -f ./$(DEPDIR)/pubkey-import-export.Po
|
|
-rm -f ./$(DEPDIR)/random-art.Po
|