summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2012-02-01 16:27:38 -0500
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2012-04-03 17:25:25 -0400
commit5e3fe022d9eecf8943663b1e622569226920177a (patch)
tree5cccb1fa4e6e04d7749f3811f35720a3dd0d187a /tests
parent2de11b18fc9b4b0f30b7f02fb7c68fb29455c585 (diff)
Remove wocky_tls_session_add_crl
This is unused by Gabble, unsupported by GIO. Correct usage of such a feature would be system whide, not really per-applications.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am5
-rw-r--r--tests/certs/ca-0-crl.cfg2
-rw-r--r--tests/certs/ca-0-crl.pem13
l---------tests/certs/crl/c5d5c0da.r01
-rw-r--r--tests/certs/crl/ca-0-crl.pem13
-rw-r--r--tests/wocky-connector-test.c49
6 files changed, 1 insertions, 82 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a7f6d5b..dc26461 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,6 @@ NEW_CERT := $(CERT_DIR)/new-cert.pem
TLS_KEY := $(CERT_DIR)/tls-key.pem
TLS_CERT := $(CERT_DIR)/tls-cert.pem
CA_DIR := $(CERT_DIR)/cas
-CRL_DIR := $(CERT_DIR)/crl
UNKNOWN_KEY := $(CERT_DIR)/unknown-key.pem
UNKNOWN_CERT := $(CERT_DIR)/unknown-cert.pem
LIBWOCKY := $(top_builddir)/wocky/libwocky.la
@@ -344,7 +343,5 @@ EXTRA_DIST = $(SUPPRESSIONS) \
$(wildcard $(srcdir)/certs/*.cfg) \
$(wildcard $(srcdir)/certs/*.pem) \
$(wildcard $(srcdir)/certs/cas/*.pem) \
- $(wildcard $(srcdir)/certs/cas/*.0) \
- $(wildcard $(srcdir)/certs/crl/*.pem) \
- $(wildcard $(srcdir)/certs/crl/*.r0)
+ $(wildcard $(srcdir)/certs/cas/*.0)
diff --git a/tests/certs/ca-0-crl.cfg b/tests/certs/ca-0-crl.cfg
deleted file mode 100644
index 1ba1001..0000000
--- a/tests/certs/ca-0-crl.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-expiration_days = 10220
-crl_next_update = 10220
diff --git a/tests/certs/ca-0-crl.pem b/tests/certs/ca-0-crl.pem
deleted file mode 100644
index 9d8333f..0000000
--- a/tests/certs/ca-0-crl.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN X509 CRL-----
-MIIB+DCB4wIBATALBgkqhkiG9w0BAQUwbDELMAkGA1UEBhMCVUsxEjAQBgNVBAoT
-CUNvbGxhYm9yYTEZMBcGA1UECxMQV29ja3kgVGVzdCBTdWl0ZTERMA8GA1UECBMI
-Q29uZnVzZWQxGzAZBgNVBAMTEldvY2t5IFhNUFAgTGlicmFyeRcNMTAxMDAxMTM0
-ODU1WhcNMzgwOTI0MTM0ODU1WjAUMBICAQsXDTEwMTAwMTEzNDg1NVqgLzAtMB8G
-A1UdIwQYMBaAFEkwJgiMmtZpzYvAzA5cAo5KH6aMMAoGA1UdFAQDAgEAMAsGCSqG
-SIb3DQEBBQOCAQEAq1NAKBtQyP3SxIDOhkSUhWhyRw5sSWbDLunzOfa+LnNUqZHb
-WWzKNnok2xJnaNPLQHUdPp00Oz0FYaXWsbYDWWlEI5KxkCFkbalU0+rAUoXpCuAf
-hbBDDBnd2pVQpwwS+w6EBxwezq0LUyg8QcmStEV2aGd5gvyfN9f4UnA5wLL3FGQu
-DEhHxIzlfvfSI57536eoWkawq+cekDN+kwy08o1t/RXuM8+Su1AIYEHnOp8HpDyG
-2mXgoOV5ZYwCPkZy/SlCTI9FK6tbmKUUj39DK6QGk3+vgRKET/hYw+cU8FPsaQ6K
-LQmLVOHS+o6drp1869JhiJktfhxMEw8bRgta0Q==
------END X509 CRL-----
diff --git a/tests/certs/crl/c5d5c0da.r0 b/tests/certs/crl/c5d5c0da.r0
deleted file mode 120000
index f0c8057..0000000
--- a/tests/certs/crl/c5d5c0da.r0
+++ /dev/null
@@ -1 +0,0 @@
-ca-0-crl.pem \ No newline at end of file
diff --git a/tests/certs/crl/ca-0-crl.pem b/tests/certs/crl/ca-0-crl.pem
deleted file mode 100644
index 9d8333f..0000000
--- a/tests/certs/crl/ca-0-crl.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN X509 CRL-----
-MIIB+DCB4wIBATALBgkqhkiG9w0BAQUwbDELMAkGA1UEBhMCVUsxEjAQBgNVBAoT
-CUNvbGxhYm9yYTEZMBcGA1UECxMQV29ja3kgVGVzdCBTdWl0ZTERMA8GA1UECBMI
-Q29uZnVzZWQxGzAZBgNVBAMTEldvY2t5IFhNUFAgTGlicmFyeRcNMTAxMDAxMTM0
-ODU1WhcNMzgwOTI0MTM0ODU1WjAUMBICAQsXDTEwMTAwMTEzNDg1NVqgLzAtMB8G
-A1UdIwQYMBaAFEkwJgiMmtZpzYvAzA5cAo5KH6aMMAoGA1UdFAQDAgEAMAsGCSqG
-SIb3DQEBBQOCAQEAq1NAKBtQyP3SxIDOhkSUhWhyRw5sSWbDLunzOfa+LnNUqZHb
-WWzKNnok2xJnaNPLQHUdPp00Oz0FYaXWsbYDWWlEI5KxkCFkbalU0+rAUoXpCuAf
-hbBDDBnd2pVQpwwS+w6EBxwezq0LUyg8QcmStEV2aGd5gvyfN9f4UnA5wLL3FGQu
-DEhHxIzlfvfSI57536eoWkawq+cekDN+kwy08o1t/RXuM8+Su1AIYEHnOp8HpDyG
-2mXgoOV5ZYwCPkZy/SlCTI9FK6tbmKUUj39DK6QGk3+vgRKET/hYw+cU8FPsaQ6K
-LQmLVOHS+o6drp1869JhiJktfhxMEw8bRgta0Q==
------END X509 CRL-----
diff --git a/tests/wocky-connector-test.c b/tests/wocky-connector-test.c
index 82c12b2..6ca489f 100644
--- a/tests/wocky-connector-test.c
+++ b/tests/wocky-connector-test.c
@@ -2680,18 +2680,6 @@ test_t tests[] =
{ "moose@tomato-juice.org", "something", PLAIN, TLS },
{ "tomato-juice.org", 0, XMPP_V1 } } },
- { "/connector/cert-verification/tls/crl/fail",
- QUIET,
- { S_WOCKY_TLS_CERT_ERROR, WOCKY_TLS_CERT_REVOKED, -1 },
- { { TLS, NULL },
- { SERVER_PROBLEM_NO_PROBLEM, CONNECTOR_OK },
- { "moose", "something" },
- PORT_XMPP, CERT_REVOKED },
- { "weasel-juice.org", PORT_XMPP, "thud.org", REACHABLE, UNREACHABLE },
- { PLAINTEXT_OK,
- { "moose@weasel-juice.org", "something", PLAIN, TLS },
- { NULL, 0, XMPP_V1 } } },
-
{ "/connector/cert-verification/tls/expired/fail",
QUIET,
{ S_WOCKY_TLS_CERT_ERROR, WOCKY_TLS_CERT_EXPIRED, -1 },
@@ -2808,18 +2796,6 @@ test_t tests[] =
{ "moose@tomato-juice.org", "something", PLAIN, TLS },
{ "tomato-juice.org", 0, XMPP_V1, OLD_SSL } } },
- { "/connector/cert-verification/ssl/crl/fail",
- QUIET,
- { S_WOCKY_TLS_CERT_ERROR, WOCKY_TLS_CERT_REVOKED, -1 },
- { { TLS, NULL },
- { SERVER_PROBLEM_NO_PROBLEM, { XMPP_PROBLEM_OLD_SSL, OK, OK, OK, OK } },
- { "moose", "something" },
- PORT_XMPP, CERT_REVOKED },
- { "weasel-juice.org", PORT_XMPP, "thud.org", REACHABLE, UNREACHABLE },
- { PLAINTEXT_OK,
- { "moose@weasel-juice.org", "something", PLAIN, TLS },
- { NULL, 0, XMPP_V1, OLD_SSL } } },
-
{ "/connector/cert-verification/ssl/expired/fail",
QUIET,
{ S_WOCKY_TLS_CERT_ERROR, WOCKY_TLS_CERT_EXPIRED, -1 },
@@ -2918,18 +2894,6 @@ test_t tests[] =
{ "moose@tomato-juice.org", "something", PLAIN, TLS },
{ "tomato-juice.org", 0, XMPP_V1, STARTTLS, CERT_CHECK_LENIENT } } },
- { "/connector/cert-nonverification/tls/crl/fail",
- QUIET,
- { S_WOCKY_TLS_CERT_ERROR, WOCKY_TLS_CERT_REVOKED, -1 },
- { { TLS, NULL },
- { SERVER_PROBLEM_NO_PROBLEM, CONNECTOR_OK },
- { "moose", "something" },
- PORT_XMPP, CERT_REVOKED },
- { "weasel-juice.org", PORT_XMPP, "thud.org", REACHABLE, UNREACHABLE },
- { PLAINTEXT_OK,
- { "moose@weasel-juice.org", "something", PLAIN, TLS },
- { NULL, 0, XMPP_V1, STARTTLS, CERT_CHECK_LENIENT } } },
-
{ "/connector/cert-nonverification/tls/expired/ok",
QUIET,
{ S_NO_ERROR, },
@@ -3028,18 +2992,6 @@ test_t tests[] =
{ "moose@tomato-juice.org", "something", PLAIN, TLS },
{ "tomato-juice.org", 0, XMPP_V1, OLD_SSL, CERT_CHECK_LENIENT } } },
- { "/connector/cert-nonverification/ssl/crl/fail",
- QUIET,
- { S_WOCKY_TLS_CERT_ERROR, WOCKY_TLS_CERT_REVOKED, -1 },
- { { TLS, NULL },
- { SERVER_PROBLEM_NO_PROBLEM, { XMPP_PROBLEM_OLD_SSL, OK, OK, OK, OK } },
- { "moose", "something" },
- PORT_XMPP, CERT_REVOKED },
- { "weasel-juice.org", PORT_XMPP, "thud.org", REACHABLE, UNREACHABLE },
- { PLAINTEXT_OK,
- { "moose@weasel-juice.org", "something", PLAIN, TLS },
- { NULL, 0, XMPP_V1, OLD_SSL, CERT_CHECK_LENIENT } } },
-
{ "/connector/cert-nonverification/ssl/expired/ok",
QUIET,
{ S_NO_ERROR, },
@@ -3372,7 +3324,6 @@ run_test (gpointer data)
NULL);
wocky_tls_handler_add_ca (handler, ca);
- wocky_tls_handler_add_crl (handler, TLS_CRL_DIR);
g_object_unref (handler);