tests: Fix Y2011 bug in testsuite.

The tests have been failing for a few days now, because the PKI expired a
few days into 2011.  This commit instead generates the PKI at "make check"
time, which has the additional benefit of getting some test exposure for
the ovs-pki program.

Reported-by: Aaron M. Ucko <ucko@debian.org>
CC: 609506@bugs.debian.org

diff --git a/AUTHORS b/AUTHORS
index 3eb47a4cafb5f216c9ea7ea0b8c5725858a16139..c57d43b1c844660120d05374a8b349d472a37309 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,7 @@ Yu Zhiguo               yuzg@cn.fujitsu.com
 The following additional people are mentioned in commit logs as having
 provided helpful bug reports or suggestions.
 
 The following additional people are mentioned in commit logs as having
 provided helpful bug reports or suggestions.
 

+Aaron M. Ucko           ucko@debian.org

 Alexey I. Froloff       raorn@altlinux.org
 Brad Hall               brad@nicira.com
 Brandon Heller          brandonh@stanford.edu
 Alexey I. Froloff       raorn@altlinux.org
 Brad Hall               brad@nicira.com
 Brandon Heller          brandonh@stanford.edu

diff --git a/Makefile.am b/Makefile.am
index eef8eb6bbdc3a73e1e5380dc7db5286ae5c8b9aa..689fd6cc3a2aed2b71ec43e0aae8b6138f37b77a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010 Nicira Networks, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Nicira Networks, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright


@@ -27,6 +27,7 @@ endif
 ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
 ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =

+CLEAN_LOCAL =

 DISTCLEANFILES =
 EXTRA_DIST = \
        CodingStyle \
 DISTCLEANFILES =
 EXTRA_DIST = \
        CodingStyle \


@@ -60,6 +61,7 @@ noinst_PROGRAMS =
 noinst_SCRIPTS =
 OVSIDL_BUILT =
 SUFFIXES =
 noinst_SCRIPTS =
 OVSIDL_BUILT =
 SUFFIXES =

+check_DATA =

 
 # This ensures that files added to EXTRA_DIST are always distributed,
 # even if they are inside an Automake if...endif conditional block that is
 
 # This ensures that files added to EXTRA_DIST are always distributed,
 # even if they are inside an Automake if...endif conditional block that is


@@ -124,7 +126,8 @@ CLEANFILES += distfiles
 
 dist-hook: $(DIST_HOOKS)
 all-local: $(ALL_LOCAL)
 
 dist-hook: $(DIST_HOOKS)
 all-local: $(ALL_LOCAL)

-.PHONY: $(DIST_HOOKS)
+clean-local: $(CLEAN_LOCAL)
+.PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL)

 
 include lib/automake.mk
 include ofproto/automake.mk
 
 include lib/automake.mk
 include ofproto/automake.mk

diff --git a/README b/README
index 16f2ee676e11c20e82254da174aceb1ddc31fc96..114878db8e6646a8209daa5dd074f35a63bf1d71 100644 (file)
--- a/README
+++ b/README
@@ -104,7 +104,7 @@ INSTALL.KVM.
 To install Open vSwitch without using a kernel module, read
 INSTALL.userspace.
 
 To install Open vSwitch without using a kernel module, read
 INSTALL.userspace.
 

-To learn set up SSL support for Open vSwitch, read INSTALL.SSL.
+To learn how to set up SSL support for Open vSwitch, read INSTALL.SSL.

 
 Each Open vSwitch userspace program is accompanied by a manpage.  Many
 of the manpages are customized to your configuration as part of the
 
 Each Open vSwitch userspace program is accompanied by a manpage.  Many
 of the manpages are customized to your configuration as part of the

diff --git a/tests/automake.mk b/tests/automake.mk
index c50b62ea6dc27ea8bafd2c3d1ee206037c5360b7..0098c203aea2d1f1cf23b19301a95a416bd067c4 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -281,14 +281,6 @@ tests_test_uuid_LDADD = lib/libopenvswitch.a
 noinst_PROGRAMS += tests/test-vconn
 tests_test_vconn_SOURCES = tests/test-vconn.c
 tests_test_vconn_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 noinst_PROGRAMS += tests/test-vconn
 tests_test_vconn_SOURCES = tests/test-vconn.c
 tests_test_vconn_LDADD = lib/libopenvswitch.a $(SSL_LIBS)

-EXTRA_DIST += \
-       tests/testpki-cacert.pem \
-       tests/testpki-cert.pem \
-       tests/testpki-cert2.pem \
-       tests/testpki-privkey.pem \
-       tests/testpki-privkey2.pem \
-       tests/testpki-req.pem \
-       tests/testpki-req2.pem

 
 noinst_PROGRAMS += tests/test-byte-order
 tests_test_byte_order_SOURCES = tests/test-byte-order.c
 
 noinst_PROGRAMS += tests/test-byte-order
 tests_test_byte_order_SOURCES = tests/test-byte-order.c


@@ -301,3 +293,39 @@ EXTRA_DIST += \
        tests/test-jsonrpc.py \
        tests/test-ovsdb.py \
        tests/test-reconnect.py
        tests/test-jsonrpc.py \
        tests/test-ovsdb.py \
        tests/test-reconnect.py

+
+if HAVE_OPENSSL
+TESTPKI_FILES = \
+       tests/testpki-cacert.pem \
+       tests/testpki-cert.pem \
+       tests/testpki-privkey.pem \
+       tests/testpki-req.pem \
+       tests/testpki-cert2.pem \
+       tests/testpki-privkey2.pem \
+       tests/testpki-req2.pem
+check_DATA += $(TESTPKI_FILES)
+CLEANFILES += $(TESTPKI_FILES)
+
+tests/testpki-cacert.pem: tests/pki/stamp; cp tests/pki/switchca/cacert.pem $@
+tests/testpki-cert.pem: tests/pki/stamp; cp tests/pki/test-cert.pem $@
+tests/testpki-req.pem: tests/pki/stamp; cp tests/pki/test-req.pem $@
+tests/testpki-privkey.pem: tests/pki/stamp; cp tests/pki/test-privkey.pem $@
+tests/testpki-cert2.pem: tests/pki/stamp; cp tests/pki/test2-cert.pem $@
+tests/testpki-req2.pem: tests/pki/stamp; cp tests/pki/test2-req.pem $@
+tests/testpki-privkey2.pem: tests/pki/stamp; cp tests/pki/test2-privkey.pem $@
+
+OVS_PKI = $(SHELL) $(srcdir)/utilities/ovs-pki.in --dir=tests/pki --log=tests/ovs-pki.log
+tests/pki/stamp:
+       rm -f tests/pki/stamp
+       rm -rf tests/pki
+       $(OVS_PKI) init
+       $(OVS_PKI) req+sign tests/pki/test
+       $(OVS_PKI) req+sign tests/pki/test2
+       : > tests/pki/stamp
+CLEANFILES += tests/ovs-pki.log
+
+CLEAN_LOCAL += clean-pki
+clean-pki:
+       rm -f tests/pki/stamp
+       rm -rf tests/pki
+endif

diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index 23125ab460ebecbf98bbd5998e3346c4215c1247..c9168f8dff47cba4d5dc7d32c00855fc6e206c7c 100644 (file)
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -106,7 +106,7 @@ AT_KEYWORDS([ovsdb server positive ssl $5])
 AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
 AT_SKIP_IF([test "x$RANDOM" = x])
 SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)`
 AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
 AT_SKIP_IF([test "x$RANDOM" = x])
 SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)`

-PKIDIR=$abs_top_srcdir/tests
+PKIDIR=$abs_top_builddir/tests

 AT_SKIP_IF([expr "$PKIDIR" : ".*[      '\"
 \r\\]"])
 AT_DATA([schema],
 AT_SKIP_IF([expr "$PKIDIR" : ".*[      '\"
 \r\\]"])
 AT_DATA([schema],


@@ -299,7 +299,7 @@ m4_define([OVSDB_CHECK_EXECUTION],
    AT_DATA([schema], [$2
 ])
    SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)`
    AT_DATA([schema], [$2
 ])
    SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)`

-   PKIDIR=$abs_top_srcdir/tests
+   PKIDIR=$abs_top_builddir/tests

    AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
    AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl=$PWD/unixctl db], [0], [ignore], [ignore])
    m4_foreach([txn], [$3], 
    AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
    AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl=$PWD/unixctl db], [0], [ignore], [ignore])
    m4_foreach([txn], [$3], 

diff --git a/tests/testpki-cacert.pem b/tests/testpki-cacert.pem
deleted file mode 100644 (file)
index e888505..0000000
--- a/tests/testpki-cacert.pem
+++ /dev/null
@@ -1,70 +0,0 @@
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=CA, O=Open vSwitch, OU=switchca, CN=OVS switchca CA Certificate (2010 Jan 06 17:08:30)
-        Validity
-            Not Before: Jan  7 01:08:32 2010 GMT
-            Not After : Jan  7 01:08:32 2016 GMT
-        Subject: C=US, ST=CA, O=Open vSwitch, OU=switchca, CN=OVS switchca CA Certificate (2010 Jan 06 17:08:30)
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:cc:b2:25:ba:07:b8:d6:e1:23:20:1e:41:a1:49:
-                    35:68:09:71:19:ef:68:a0:45:e0:bd:33:41:0d:2b:
-                    b7:7d:33:16:57:d4:16:da:ba:a0:7e:ae:9c:76:5b:
-                    92:93:96:a9:5b:bd:6f:b3:fd:6a:62:b9:10:46:98:
-                    d9:b4:ea:ab:99:f3:72:4b:d1:11:81:77:75:09:be:
-                    fd:9f:55:f7:6c:78:0a:b1:9d:f8:c5:c5:a0:de:05:
-                    0d:78:62:66:ed:b1:0f:b3:9a:69:fd:13:9f:43:a7:
-                    aa:e4:3c:a1:63:68:46:c2:a1:56:56:eb:62:b5:0e:
-                    2b:be:7b:8e:c9:aa:c2:6f:04:af:7b:5a:ed:4b:16:
-                    fb:47:4d:45:81:d8:b8:2e:08:21:a7:4d:cc:78:9b:
-                    b0:b0:a0:18:91:53:ab:64:c3:eb:66:74:93:cc:8a:
-                    b4:40:c5:4e:2e:cc:c5:63:c0:6b:2d:6e:cd:b9:1c:
-                    a9:45:ad:82:0a:d2:1f:5d:84:bc:29:a1:82:0d:75:
-                    1c:1a:21:8b:15:03:88:94:e5:89:ed:48:22:e0:7e:
-                    b9:15:f1:13:fb:6c:a2:48:c7:2d:e5:01:04:b7:23:
-                    6a:06:45:7b:e3:14:59:ac:1d:87:e6:a5:ec:7c:86:
-                    80:17:64:71:a0:43:27:27:f5:2c:bd:34:60:c7:a1:
-                    22:3f
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        c7:85:13:17:b6:ca:c8:1b:8a:8e:eb:3b:64:05:e4:d5:a2:2c:
-        6b:ee:83:d8:e0:67:f9:99:59:15:59:9d:6d:16:c0:6b:c3:ed:
-        61:31:0a:40:1b:63:1d:57:a5:67:3d:46:55:6b:9f:ed:18:79:
-        45:fc:db:d9:48:d2:86:0f:aa:e0:43:18:3f:f4:e3:71:a3:28:
-        d4:00:ae:7c:0e:91:2c:5b:5b:ff:be:ad:b6:4b:b7:0e:e3:ea:
-        7a:66:69:6c:83:90:0c:59:c1:d7:4d:1a:b9:69:0d:ac:6e:07:
-        b3:42:3c:3e:54:ac:85:c5:58:67:51:2a:c0:05:1f:70:6a:07:
-        86:2c:42:56:ee:3b:69:7b:db:35:e6:c6:5b:eb:25:66:ca:89:
-        bb:d7:37:ae:d2:b9:e8:56:38:a2:ec:ff:45:38:97:ae:43:20:
-        c8:55:c9:c8:0f:45:37:70:97:b9:8a:2e:56:52:6f:20:f3:08:
-        b7:1a:26:98:b9:d9:7d:52:69:b3:95:2b:c5:4e:0c:7b:fd:cd:
-        6a:a2:23:cf:eb:ee:de:74:17:0b:cc:a3:91:f1:41:0b:1e:94:
-        e2:ea:52:85:c1:3d:de:f9:e6:44:5a:f6:fe:7d:2f:fb:6f:60:
-        89:2c:f0:0c:c7:c7:fb:6f:23:4d:a1:18:89:28:ea:61:f4:3a:
-        9d:ca:1f:60
------BEGIN CERTIFICATE-----
-MIIDeDCCAmACAQEwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEVMBMGA1UEChMMT3BlbiB2U3dpdGNoMREwDwYDVQQLEwhzd2l0Y2hj
-YTE7MDkGA1UEAxMyT1ZTIHN3aXRjaGNhIENBIENlcnRpZmljYXRlICgyMDEwIEph
-biAwNiAxNzowODozMCkwHhcNMTAwMTA3MDEwODMyWhcNMTYwMTA3MDEwODMyWjCB
-gTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRUwEwYDVQQKEwxPcGVuIHZTd2l0
-Y2gxETAPBgNVBAsTCHN3aXRjaGNhMTswOQYDVQQDEzJPVlMgc3dpdGNoY2EgQ0Eg
-Q2VydGlmaWNhdGUgKDIwMTAgSmFuIDA2IDE3OjA4OjMwKTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMyyJboHuNbhIyAeQaFJNWgJcRnvaKBF4L0zQQ0r
-t30zFlfUFtq6oH6unHZbkpOWqVu9b7P9amK5EEaY2bTqq5nzckvREYF3dQm+/Z9V
-92x4CrGd+MXFoN4FDXhiZu2xD7Oaaf0Tn0OnquQ8oWNoRsKhVlbrYrUOK757jsmq
-wm8Er3ta7UsW+0dNRYHYuC4IIadNzHibsLCgGJFTq2TD62Z0k8yKtEDFTi7MxWPA
-ay1uzbkcqUWtggrSH12EvCmhgg11HBohixUDiJTlie1IIuB+uRXxE/tsokjHLeUB
-BLcjagZFe+MUWawdh+al7HyGgBdkcaBDJyf1LL00YMehIj8CAwEAATANBgkqhkiG
-9w0BAQQFAAOCAQEAx4UTF7bKyBuKjus7ZAXk1aIsa+6D2OBn+ZlZFVmdbRbAa8Pt
-YTEKQBtjHVelZz1GVWuf7Rh5Rfzb2UjShg+q4EMYP/TjcaMo1ACufA6RLFtb/76t
-tku3DuPqemZpbIOQDFnB100auWkNrG4Hs0I8PlSshcVYZ1EqwAUfcGoHhixCVu47
-aXvbNebGW+slZsqJu9c3rtK56FY4ouz/RTiXrkMgyFXJyA9FN3CXuYouVlJvIPMI
-txommLnZfVJps5UrxU4Me/3NaqIjz+vu3nQXC8yjkfFBCx6U4upShcE93vnmRFr2
-/n0v+29giSzwDMfH+28jTaEYiSjqYfQ6ncofYA==
------END CERTIFICATE-----

diff --git a/tests/testpki-cert.pem b/tests/testpki-cert.pem
deleted file mode 100644 (file)
index 75d815d..0000000
--- a/tests/testpki-cert.pem
+++ /dev/null
@@ -1,70 +0,0 @@
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number: 2 (0x2)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=CA, O=Open vSwitch, OU=switchca, CN=OVS switchca CA Certificate (2010 Jan 06 17:08:30)
-        Validity
-            Not Before: Jan  7 01:08:59 2010 GMT
-            Not After : Jan  7 01:08:59 2011 GMT
-        Subject: C=US, ST=CA, O=Open vSwitch, OU=Open vSwitch certifier, CN=Open vSwitch certificate for testpki
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:ac:3f:c6:b1:ef:a3:e3:68:98:2c:91:a1:3a:21:
-                    02:38:87:5b:75:7a:1c:17:c9:b0:64:a9:f7:80:17:
-                    08:0f:b5:25:b4:46:80:6b:7e:92:ab:f8:93:05:17:
-                    77:e4:12:86:eb:54:5d:a7:a0:45:70:16:5e:d7:4f:
-                    6b:7c:9f:fe:83:a4:c1:62:83:33:71:6f:4f:4e:68:
-                    84:a6:92:a5:77:8f:ad:cd:ee:bf:61:72:24:c0:64:
-                    df:73:98:de:37:6b:b8:4d:78:f4:ba:06:95:64:ef:
-                    82:b1:2f:71:01:44:ca:3c:de:fa:32:28:b6:ea:72:
-                    7b:4d:d6:a0:fb:4b:73:de:a9:7f:25:ad:20:02:3d:
-                    5f:7f:7f:8e:91:34:97:0a:10:96:be:3d:ee:37:5b:
-                    a9:91:9e:7f:d5:ac:7b:e3:56:47:a4:14:15:dd:48:
-                    ce:32:6f:c4:83:09:07:31:bb:34:77:4d:f7:12:70:
-                    86:b8:b2:64:16:3b:ea:d2:72:e0:73:6b:6f:ce:59:
-                    cf:56:6d:a8:94:3c:10:d7:47:7e:b2:91:9d:c7:65:
-                    23:8a:b1:ca:9c:15:36:c5:d9:db:b1:e7:b8:1f:09:
-                    20:1d:da:97:de:93:7c:e2:5d:94:ea:38:d8:ce:60:
-                    c9:9e:43:da:6d:9d:c9:d2:a0:e9:6d:5a:9b:57:53:
-                    86:7d
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        19:a9:2a:66:fc:09:78:c9:87:e6:73:be:9a:d2:b7:87:07:7b:
-        93:70:04:cd:f2:c9:47:a3:8f:9f:c4:af:92:ef:cf:07:d3:83:
-        90:f7:8a:f0:55:f6:8a:2e:af:57:b9:e4:9c:72:37:b7:af:12:
-        fb:dc:07:9b:94:7b:18:c8:53:86:6d:02:77:eb:e3:ac:21:e1:
-        6d:b5:fe:04:6b:a1:d2:78:a6:58:4b:5d:a7:17:e1:3b:d9:94:
-        ab:81:5e:c1:9a:b5:34:a5:a7:9a:2b:1b:74:d7:a4:aa:fa:81:
-        5c:e5:5f:1a:07:54:36:21:76:04:a9:5e:11:38:46:b8:1c:11:
-        15:78:f8:0c:31:8d:9a:a3:e4:d0:72:a8:29:80:c2:3d:9d:f6:
-        61:dd:ca:c9:6c:7e:ca:c0:0d:61:28:4d:3e:ea:51:9d:c2:c4:
-        7c:47:da:cc:24:35:9c:2a:0d:ac:ea:5f:33:5a:ab:b7:94:cb:
-        3f:91:38:92:a3:62:3b:40:ef:79:55:96:b3:24:5a:19:a2:53:
-        99:63:f9:85:d4:b6:48:b8:9a:f8:bc:b7:74:f8:cf:95:dc:1a:
-        f2:66:cd:2b:4b:d4:c1:19:69:77:f9:f6:08:04:61:cd:80:ee:
-        46:44:27:82:49:60:a9:be:4b:51:75:ca:15:16:0b:97:c2:2f:
-        26:f2:dd:42
------BEGIN CERTIFICATE-----
-MIIDeDCCAmACAQIwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEVMBMGA1UEChMMT3BlbiB2U3dpdGNoMREwDwYDVQQLEwhzd2l0Y2hj
-YTE7MDkGA1UEAxMyT1ZTIHN3aXRjaGNhIENBIENlcnRpZmljYXRlICgyMDEwIEph
-biAwNiAxNzowODozMCkwHhcNMTAwMTA3MDEwODU5WhcNMTEwMTA3MDEwODU5WjCB
-gTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRUwEwYDVQQKEwxPcGVuIHZTd2l0
-Y2gxHzAdBgNVBAsTFk9wZW4gdlN3aXRjaCBjZXJ0aWZpZXIxLTArBgNVBAMTJE9w
-ZW4gdlN3aXRjaCBjZXJ0aWZpY2F0ZSBmb3IgdGVzdHBraTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKw/xrHvo+NomCyRoTohAjiHW3V6HBfJsGSp94AX
-CA+1JbRGgGt+kqv4kwUXd+QShutUXaegRXAWXtdPa3yf/oOkwWKDM3FvT05ohKaS
-pXePrc3uv2FyJMBk33OY3jdruE149LoGlWTvgrEvcQFEyjze+jIotupye03WoPtL
-c96pfyWtIAI9X39/jpE0lwoQlr497jdbqZGef9Wse+NWR6QUFd1IzjJvxIMJBzG7
-NHdN9xJwhriyZBY76tJy4HNrb85Zz1ZtqJQ8ENdHfrKRncdlI4qxypwVNsXZ27Hn
-uB8JIB3al96TfOJdlOo42M5gyZ5D2m2dydKg6W1am1dThn0CAwEAATANBgkqhkiG
-9w0BAQQFAAOCAQEAGakqZvwJeMmH5nO+mtK3hwd7k3AEzfLJR6OPn8Svku/PB9OD
-kPeK8FX2ii6vV7nknHI3t68S+9wHm5R7GMhThm0Cd+vjrCHhbbX+BGuh0nimWEtd
-pxfhO9mUq4FewZq1NKWnmisbdNekqvqBXOVfGgdUNiF2BKleEThGuBwRFXj4DDGN
-mqPk0HKoKYDCPZ32Yd3KyWx+ysANYShNPupRncLEfEfazCQ1nCoNrOpfM1qrt5TL
-P5E4kqNiO0DveVWWsyRaGaJTmWP5hdS2SLia+Ly3dPjPldwa8mbNK0vUwRlpd/n2
-CARhzYDuRkQngklgqb5LUXXKFRYLl8IvJvLdQg==
------END CERTIFICATE-----

diff --git a/tests/testpki-cert2.pem b/tests/testpki-cert2.pem
deleted file mode 100644 (file)
index b282bd0..0000000
--- a/tests/testpki-cert2.pem
+++ /dev/null
@@ -1,70 +0,0 @@
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number: 3 (0x3)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=CA, O=Open vSwitch, OU=switchca, CN=OVS switchca CA Certificate (2010 Jan 06 17:08:30)
-        Validity
-            Not Before: Jan 11 20:06:58 2010 GMT
-            Not After : Jan 11 20:06:58 2011 GMT
-        Subject: C=US, ST=CA, O=Open vSwitch, OU=Open vSwitch certifier, CN=Open vSwitch certificate for testpki2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:b0:0a:97:1e:d8:48:76:57:32:e6:4d:d7:84:86:
-                    7a:d8:0c:b7:a4:13:9c:23:bc:d5:01:94:10:81:f7:
-                    5f:b7:70:ba:1e:85:c6:5c:72:ca:cc:2a:d5:fe:cc:
-                    94:0b:54:5e:ae:40:fd:d9:c1:cc:8b:58:7e:87:73:
-                    5e:ac:98:17:f2:93:b4:cd:d7:dd:12:59:b7:8e:31:
-                    d8:63:c9:7a:14:27:f6:67:64:cb:8f:b1:d4:c1:3c:
-                    be:30:e2:08:1e:e2:db:12:9b:23:53:9f:6b:46:9b:
-                    08:46:80:6f:89:f5:77:88:b8:e0:48:89:be:0e:47:
-                    c5:5e:64:28:7e:c3:f3:10:cb:e2:95:20:6a:81:7a:
-                    14:e3:8f:e8:b8:d3:f9:31:b2:98:0c:a6:5e:9f:ea:
-                    25:89:34:22:f2:fc:a1:5d:2b:2d:0a:40:85:7a:ff:
-                    4f:5e:5a:51:72:f2:b8:03:17:db:d2:3e:40:7f:1b:
-                    6b:f1:ad:e8:ae:d3:33:d4:ad:9c:05:d4:b1:1f:53:
-                    1d:45:18:50:31:28:88:56:93:a7:f9:b2:cd:90:d5:
-                    91:dc:14:a9:33:2d:0b:8c:74:7d:94:1e:be:58:d7:
-                    fe:1e:6d:a5:a5:3b:e2:66:f0:06:f9:d9:5c:2c:66:
-                    fb:7b:85:38:13:65:ff:38:ba:1b:59:f4:08:a0:49:
-                    03:3f
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        6b:36:9d:38:52:14:c7:59:a4:3d:39:eb:7f:47:53:8a:f2:3e:
-        42:b3:ba:f9:1b:9f:72:3f:3d:38:7f:c7:41:2d:e9:9d:ed:94:
-        50:79:00:55:d0:52:8a:c4:2f:0b:74:36:05:d4:0a:d5:fd:a6:
-        87:6e:3a:e2:12:c0:4e:0e:92:9f:98:8d:77:68:0a:bf:21:0d:
-        78:20:03:0e:13:9f:49:cf:bd:c3:42:b2:69:a6:d0:67:e8:33:
-        e0:f2:9e:1c:ff:04:2f:1b:fd:37:68:a9:23:54:a5:a2:83:9d:
-        cb:ee:70:3a:c5:03:30:51:c6:90:01:39:f4:e1:29:be:53:2e:
-        fd:71:90:b7:31:33:95:70:48:98:08:4b:2f:3b:33:11:ba:4c:
-        ce:ed:f5:d8:f7:02:e7:da:f3:e9:56:9d:3a:e2:af:ec:61:e5:
-        9c:06:8a:21:18:64:5c:b8:71:e5:4e:64:cc:2d:35:65:e7:cb:
-        96:f3:8b:bc:51:79:42:92:70:e2:e4:28:70:58:44:81:45:83:
-        e2:c3:2c:3b:5b:01:04:94:ce:25:40:8e:15:a3:b3:05:e4:68:
-        17:4b:50:41:1a:58:51:75:81:0c:72:bd:4c:bc:b3:d1:dd:d9:
-        aa:8f:8c:b4:bb:61:b7:55:c1:3f:74:2c:76:73:1e:25:cc:3d:
-        5c:ac:d5:22
------BEGIN CERTIFICATE-----
-MIIDeTCCAmECAQMwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEVMBMGA1UEChMMT3BlbiB2U3dpdGNoMREwDwYDVQQLEwhzd2l0Y2hj
-YTE7MDkGA1UEAxMyT1ZTIHN3aXRjaGNhIENBIENlcnRpZmljYXRlICgyMDEwIEph
-biAwNiAxNzowODozMCkwHhcNMTAwMTExMjAwNjU4WhcNMTEwMTExMjAwNjU4WjCB
-gjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRUwEwYDVQQKEwxPcGVuIHZTd2l0
-Y2gxHzAdBgNVBAsTFk9wZW4gdlN3aXRjaCBjZXJ0aWZpZXIxLjAsBgNVBAMTJU9w
-ZW4gdlN3aXRjaCBjZXJ0aWZpY2F0ZSBmb3IgdGVzdHBraTIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCwCpce2Eh2VzLmTdeEhnrYDLekE5wjvNUBlBCB
-91+3cLoehcZccsrMKtX+zJQLVF6uQP3ZwcyLWH6Hc16smBfyk7TN190SWbeOMdhj
-yXoUJ/ZnZMuPsdTBPL4w4gge4tsSmyNTn2tGmwhGgG+J9XeIuOBIib4OR8VeZCh+
-w/MQy+KVIGqBehTjj+i40/kxspgMpl6f6iWJNCLy/KFdKy0KQIV6/09eWlFy8rgD
-F9vSPkB/G2vxreiu0zPUrZwF1LEfUx1FGFAxKIhWk6f5ss2Q1ZHcFKkzLQuMdH2U
-Hr5Y1/4ebaWlO+Jm8Ab52VwsZvt7hTgTZf84uhtZ9AigSQM/AgMBAAEwDQYJKoZI
-hvcNAQEEBQADggEBAGs2nThSFMdZpD05639HU4ryPkKzuvkbn3I/PTh/x0Et6Z3t
-lFB5AFXQUorELwt0NgXUCtX9poduOuISwE4Okp+YjXdoCr8hDXggAw4Tn0nPvcNC
-smmm0GfoM+Dynhz/BC8b/TdoqSNUpaKDncvucDrFAzBRxpABOfThKb5TLv1xkLcx
-M5VwSJgISy87MxG6TM7t9dj3Aufa8+lWnTrir+xh5ZwGiiEYZFy4ceVOZMwtNWXn
-y5bzi7xReUKScOLkKHBYRIFFg+LDLDtbAQSUziVAjhWjswXkaBdLUEEaWFF1gQxy
-vUy8s9Hd2aqPjLS7YbdVwT90LHZzHiXMPVys1SI=
------END CERTIFICATE-----

diff --git a/tests/testpki-privkey.pem b/tests/testpki-privkey.pem
deleted file mode 100644 (file)
index 759f58a..0000000
--- a/tests/testpki-privkey.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEArD/Gse+j42iYLJGhOiECOIdbdXocF8mwZKn3gBcID7UltEaA
-a36Sq/iTBRd35BKG61Rdp6BFcBZe109rfJ/+g6TBYoMzcW9PTmiEppKld4+tze6/
-YXIkwGTfc5jeN2u4TXj0ugaVZO+CsS9xAUTKPN76Mii26nJ7Tdag+0tz3ql/Ja0g
-Aj1ff3+OkTSXChCWvj3uN1upkZ5/1ax741ZHpBQV3UjOMm/EgwkHMbs0d033EnCG
-uLJkFjvq0nLgc2tvzlnPVm2olDwQ10d+spGdx2UjirHKnBU2xdnbsee4HwkgHdqX
-3pN84l2U6jjYzmDJnkPabZ3J0qDpbVqbV1OGfQIDAQABAoIBADr/MSAa82hdl9mU
-G8PcMHWKLxJCu8KOC0O/T41o1hMDOaHQkAXBeZ07a6fPzPmqOtn5sIZMh9wHXX6j
-ri4mYrdWRAJo68LLnD8/30dqbRBRfvdM8fH/dYUMR9jBIEOdOqgWaMQaoyrKOlpT
-5IHJvPcybEGn3lbY1VDo1YSc6Ff36AGLdORVH8dY9tYx/IKbyzRmDvzai6EVSDtl
-yp2zinXRNJ+AVwB0epsKbOVZa0WaYN1KclqOtFn7xANoUvy5YBHZDedC3yWxuZvZ
-dNeTjUniauukz7ivKg9/rWZFfYZ2251mrOfO9aIHOUzBurbDS/rzjVgwQmv483T9
-2cDL/IUCgYEA3tXDA0Mcv1d7IzP6A4CQ6o49JyWVkMHxKkhZy1cR+pBRc7tgpQrF
-YrtEWdsDvUJLGMUQBmm7VMpMjTRQ/YuBcdIB2USkJcDHPaZRAA1mlDPG6cSsy7yI
-d2qZFOOkUEjLqKicxiHTrCOz9HBb1McolTo9h5SdfBy5bHb9LPul3E8CgYEAxeKk
-L3m1C1rFVpVF8zoHF+zK3/d9zwzdLzmFfFrKqzIT3/6cJKEwHLJN69mja60+MKLZ
-6F1G+R4/JxE8TnCSXHh7UYULhyFolZaWwZn5xVld0210QU+f4EBUZMt4bZjDxEyr
-/vxDZaqu7SB5Mmqq++C9YzdeIk1GGJ0TE2MmwXMCgYEAuPJ+ayS2pXD8ONmY9nMs
-1CC+TNF686ykd02ZiZV4zJgfooiwzArGjQ2Uy2dmER0Gq0ZT6J605skJBGGZnva8
-tzVwZ137R4JbW6XAsORucS8QN1IPgQG32jVVXOsbo67nqdJYXHIS91qir4zaCx5J
-ZqHyE6ebljlZBNc1hrJOlS0CgYEAhoc/626oYCHDistMlMBcVi2K9pwAkaRDMnm+
-f/4RTjVrQZqMeHKEjN3DD5YT/X33i4UK82eGepHPiTW0c/cf6XGXFKKIZcOWoCuS
-LegJ39qTaMs+f7AsFn5lYWjaZFe4r1kYjO7eut1AssCi5F2UBEyTNEJN4q/5+X2/
-nCyKCnUCgYBzxbUnJBhuA8ivNb/lXdGCvqnBaZb1Bjb+Ljv0yDhMVEJwKpGpm5H3
-DySodzklBrU+eL9TLPcFM6N+okmDsMQqUygUJ1PXLRZKnpLVRILmHcMWbgCrbw4Q
-pd22A01NncdtPY2107ZeVZnjzqHF+5CXxMlKBl4QG07KFtzbNOcQuA==
------END RSA PRIVATE KEY-----

diff --git a/tests/testpki-privkey2.pem b/tests/testpki-privkey2.pem
deleted file mode 100644 (file)
index 21b2698..0000000
--- a/tests/testpki-privkey2.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAsAqXHthIdlcy5k3XhIZ62Ay3pBOcI7zVAZQQgfdft3C6HoXG
-XHLKzCrV/syUC1RerkD92cHMi1h+h3NerJgX8pO0zdfdElm3jjHYY8l6FCf2Z2TL
-j7HUwTy+MOIIHuLbEpsjU59rRpsIRoBvifV3iLjgSIm+DkfFXmQofsPzEMvilSBq
-gXoU44/ouNP5MbKYDKZen+oliTQi8vyhXSstCkCFev9PXlpRcvK4Axfb0j5Afxtr
-8a3ortMz1K2cBdSxH1MdRRhQMSiIVpOn+bLNkNWR3BSpMy0LjHR9lB6+WNf+Hm2l
-pTviZvAG+dlcLGb7e4U4E2X/OLobWfQIoEkDPwIDAQABAoIBAQCcFVe2Dnf5DQlh
-LyVmKEIk6umr/YMUIKoPkzMruKRSJg2vYFbmwxTR/yzrlIGypeSoxZENkIoGBrlw
-6TbI+rVI6/OECt/FFGzuE33Tw+CMnH4ZYEIoLrj/eBb9ins+v08T6R9iVlesK2sj
-7151yIFqZNjfF9m+GZ6COXW6J4yMl3Aq+x72IBq46pyu/WoBkxBPfXcIfImoaoUI
-2dbid5S074qmPpyfaVLkS6s77nxypH1T2dhi1TkpQmIIx+aCyxdlTmpCwa7Uik6l
-ZQxpzQPtT1aiBixJbEHmvyTnnptNTzWXQP+mxnfGUZ6TyCNtW2V3o2I9/EoHc7I4
-OXb1p/WpAoGBAOHgNlyYanlm0ezvROA/JDMPgizJJrYv9BGJez+1NaEw+gSRBFrZ
-IpVU9OuiCnkJCcNAH1KO/f4InnbJyvSweQd0CUOvNPAwqMHLjH2FnL2WQLv+9afY
-tt0oZpDT9Wj+VskYoVu2jPhGfKzSrtjevmCU7w7heUjdQM2WCYuSHLktAoGBAMeE
-8bGq+v5yfjn8/8SYvxYe3iRtpEgn8hg1XEl0VN7zVXVOVfastdh9xuNiAnHn16GT
-+4VeqYCBfb9ygcRyid048dXhLCUsD84EMsdCtKHgG0iJh2RJ7L67z4ZFgEZw03K3
-sRfRo/2QxFMIG30ZFip7MLiTZc1OvP+OZ/lovZmbAoGARqaN+mqGK1D46qZwob++
-P+Zi7kVAwY3ARtf84BF7I98g5NrDRPNT+Oeo8CcwJWmpTxQ4d+dYFOR3RGqb++tS
-//zQhQZBhbuCnZNgb0ainz5nIyZ9ijGkCQsBAd36jgu385Crr/cqouHRT3Fa1WTe
-oXEUUVA/UoY6JdP/SlO6fkUCgYBfTFHBYgCm3nsKKZzlA2xqHW5Pigso5+OLypj9
-ANK09xc/g54tx4rIEDOaUisGyw1EwREnP/LITZGJiyEOewL8poFkfjv+uVAHQBwc
-7vCmTQvbFs2TinfJFp3l7XZ6rtNgfPrafKjOqYIMgtfWZdAflF3OG6FJci12B0gE
-ahH9twKBgQDgMuZ2RomZST/x8ClWpE6jDJzwBRAO8RwFDQqTV3OXqu1fImTrB8x0
-Qtclr6NeHWLgb00njgZTCk4/Yo7htdMoL8CsuUJ3Rz3hzjdN2fLO5SUNNI5vJu5/
-iHCAqSlDUmPuTSIE+xvfwZrHAxPNO+xCPoAgvFXUs7BWaGJNf16HSQ==
------END RSA PRIVATE KEY-----

diff --git a/tests/testpki-req.pem b/tests/testpki-req.pem
deleted file mode 100644 (file)
index da53b10..0000000
--- a/tests/testpki-req.pem
+++ /dev/null
@@ -1,63 +0,0 @@
-Certificate Request:
-    Data:
-        Version: 0 (0x0)
-        Subject: C=US, ST=CA, L=Palo Alto, O=Open vSwitch, OU=Open vSwitch certifier, CN=Open vSwitch certificate for testpki
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:ac:3f:c6:b1:ef:a3:e3:68:98:2c:91:a1:3a:21:
-                    02:38:87:5b:75:7a:1c:17:c9:b0:64:a9:f7:80:17:
-                    08:0f:b5:25:b4:46:80:6b:7e:92:ab:f8:93:05:17:
-                    77:e4:12:86:eb:54:5d:a7:a0:45:70:16:5e:d7:4f:
-                    6b:7c:9f:fe:83:a4:c1:62:83:33:71:6f:4f:4e:68:
-                    84:a6:92:a5:77:8f:ad:cd:ee:bf:61:72:24:c0:64:
-                    df:73:98:de:37:6b:b8:4d:78:f4:ba:06:95:64:ef:
-                    82:b1:2f:71:01:44:ca:3c:de:fa:32:28:b6:ea:72:
-                    7b:4d:d6:a0:fb:4b:73:de:a9:7f:25:ad:20:02:3d:
-                    5f:7f:7f:8e:91:34:97:0a:10:96:be:3d:ee:37:5b:
-                    a9:91:9e:7f:d5:ac:7b:e3:56:47:a4:14:15:dd:48:
-                    ce:32:6f:c4:83:09:07:31:bb:34:77:4d:f7:12:70:
-                    86:b8:b2:64:16:3b:ea:d2:72:e0:73:6b:6f:ce:59:
-                    cf:56:6d:a8:94:3c:10:d7:47:7e:b2:91:9d:c7:65:
-                    23:8a:b1:ca:9c:15:36:c5:d9:db:b1:e7:b8:1f:09:
-                    20:1d:da:97:de:93:7c:e2:5d:94:ea:38:d8:ce:60:
-                    c9:9e:43:da:6d:9d:c9:d2:a0:e9:6d:5a:9b:57:53:
-                    86:7d
-                Exponent: 65537 (0x10001)
-        Attributes:
-            a0:00
-    Signature Algorithm: sha1WithRSAEncryption
-        21:46:4c:7a:a9:da:58:cf:ee:d3:0a:81:ee:cd:bf:73:cf:05:
-        93:2b:ef:f5:c7:7d:5e:96:a5:82:d2:62:34:26:8f:1e:f6:db:
-        6f:0e:05:39:a5:3c:df:bb:51:02:2f:bc:5b:a8:a0:a5:5e:ce:
-        e4:55:21:73:92:1d:bf:53:a4:f5:dc:7e:0e:f8:b1:05:57:3d:
-        0c:04:5e:a6:35:c6:ae:81:59:6c:28:c5:19:4b:8c:da:dd:1e:
-        97:51:bf:8b:f8:21:dc:c9:23:07:7a:66:66:fc:e2:b6:c6:e7:
-        f3:b4:e4:3e:7e:be:72:3e:3a:65:98:f1:6c:4f:79:8a:3c:11:
-        59:3d:9f:28:c8:80:eb:9d:e3:1d:6c:4e:b7:59:4e:48:b9:f8:
-        87:cf:35:13:f8:15:d3:6f:fb:1c:89:6f:ec:2c:24:5c:7b:9f:
-        fa:f0:a9:61:7b:4d:ab:40:84:dc:f8:5a:13:13:7a:b2:f4:09:
-        36:95:76:1d:c8:d8:33:eb:67:c8:c9:a9:de:98:9a:77:33:46:
-        83:37:19:60:d0:38:6f:dd:39:14:d7:a0:74:40:91:1f:60:bc:
-        0b:f8:ca:81:7d:88:67:c7:89:cf:4c:c5:95:65:66:f5:c2:98:
-        29:77:a2:93:b6:37:55:cc:f4:85:01:58:30:30:54:9a:c4:57:
-        35:e4:21:bd
------BEGIN CERTIFICATE REQUEST-----
-MIIC2zCCAcMCAQAwgZUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTESMBAGA1UE
-BxMJUGFsbyBBbHRvMRUwEwYDVQQKEwxPcGVuIHZTd2l0Y2gxHzAdBgNVBAsTFk9w
-ZW4gdlN3aXRjaCBjZXJ0aWZpZXIxLTArBgNVBAMTJE9wZW4gdlN3aXRjaCBjZXJ0
-aWZpY2F0ZSBmb3IgdGVzdHBraTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKw/xrHvo+NomCyRoTohAjiHW3V6HBfJsGSp94AXCA+1JbRGgGt+kqv4kwUX
-d+QShutUXaegRXAWXtdPa3yf/oOkwWKDM3FvT05ohKaSpXePrc3uv2FyJMBk33OY
-3jdruE149LoGlWTvgrEvcQFEyjze+jIotupye03WoPtLc96pfyWtIAI9X39/jpE0
-lwoQlr497jdbqZGef9Wse+NWR6QUFd1IzjJvxIMJBzG7NHdN9xJwhriyZBY76tJy
-4HNrb85Zz1ZtqJQ8ENdHfrKRncdlI4qxypwVNsXZ27HnuB8JIB3al96TfOJdlOo4
-2M5gyZ5D2m2dydKg6W1am1dThn0CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQAh
-Rkx6qdpYz+7TCoHuzb9zzwWTK+/1x31elqWC0mI0Jo8e9ttvDgU5pTzfu1ECL7xb
-qKClXs7kVSFzkh2/U6T13H4O+LEFVz0MBF6mNcaugVlsKMUZS4za3R6XUb+L+CHc
-ySMHemZm/OK2xufztOQ+fr5yPjplmPFsT3mKPBFZPZ8oyIDrneMdbE63WU5IufiH
-zzUT+BXTb/sciW/sLCRce5/68Klhe02rQITc+FoTE3qy9Ak2lXYdyNgz62fIyane
-mJp3M0aDNxlg0Dhv3TkU16B0QJEfYLwL+MqBfYhnx4nPTMWVZWb1wpgpd6KTtjdV
-zPSFAVgwMFSaxFc15CG9
------END CERTIFICATE REQUEST-----

diff --git a/tests/testpki-req2.pem b/tests/testpki-req2.pem
deleted file mode 100644 (file)
index 0ec61cd..0000000
--- a/tests/testpki-req2.pem
+++ /dev/null
@@ -1,63 +0,0 @@
-Certificate Request:
-    Data:
-        Version: 0 (0x0)
-        Subject: C=US, ST=CA, L=Palo Alto, O=Open vSwitch, OU=Open vSwitch certifier, CN=Open vSwitch certificate for testpki2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:b0:0a:97:1e:d8:48:76:57:32:e6:4d:d7:84:86:
-                    7a:d8:0c:b7:a4:13:9c:23:bc:d5:01:94:10:81:f7:
-                    5f:b7:70:ba:1e:85:c6:5c:72:ca:cc:2a:d5:fe:cc:
-                    94:0b:54:5e:ae:40:fd:d9:c1:cc:8b:58:7e:87:73:
-                    5e:ac:98:17:f2:93:b4:cd:d7:dd:12:59:b7:8e:31:
-                    d8:63:c9:7a:14:27:f6:67:64:cb:8f:b1:d4:c1:3c:
-                    be:30:e2:08:1e:e2:db:12:9b:23:53:9f:6b:46:9b:
-                    08:46:80:6f:89:f5:77:88:b8:e0:48:89:be:0e:47:
-                    c5:5e:64:28:7e:c3:f3:10:cb:e2:95:20:6a:81:7a:
-                    14:e3:8f:e8:b8:d3:f9:31:b2:98:0c:a6:5e:9f:ea:
-                    25:89:34:22:f2:fc:a1:5d:2b:2d:0a:40:85:7a:ff:
-                    4f:5e:5a:51:72:f2:b8:03:17:db:d2:3e:40:7f:1b:
-                    6b:f1:ad:e8:ae:d3:33:d4:ad:9c:05:d4:b1:1f:53:
-                    1d:45:18:50:31:28:88:56:93:a7:f9:b2:cd:90:d5:
-                    91:dc:14:a9:33:2d:0b:8c:74:7d:94:1e:be:58:d7:
-                    fe:1e:6d:a5:a5:3b:e2:66:f0:06:f9:d9:5c:2c:66:
-                    fb:7b:85:38:13:65:ff:38:ba:1b:59:f4:08:a0:49:
-                    03:3f
-                Exponent: 65537 (0x10001)
-        Attributes:
-            a0:00
-    Signature Algorithm: sha1WithRSAEncryption
-        6e:d7:7c:0b:91:75:9a:36:25:44:cf:9b:0c:6b:8f:a5:ed:f2:
-        4f:cc:bd:9f:fd:43:dd:b4:27:0a:0d:61:4c:54:99:b0:4c:a9:
-        52:3e:39:93:68:63:e1:15:fc:47:27:54:17:08:eb:b0:6a:61:
-        61:d8:d5:d4:95:fc:1e:50:ba:6a:7f:7b:33:87:a9:b4:27:6b:
-        f4:12:05:c3:90:ca:bf:98:ea:ae:d2:1e:26:bb:cd:23:cd:38:
-        c8:f0:a1:03:9e:d7:e1:e4:d9:c0:ea:b0:31:5c:ba:7c:53:d1:
-        5e:23:c2:e8:74:57:0b:fb:23:79:89:5a:88:74:96:37:7e:3a:
-        06:8d:76:fe:e0:f0:d1:8e:60:a3:7d:0c:99:16:a0:a3:ec:f9:
-        62:c0:7d:22:18:33:16:b6:a8:31:39:07:6e:8f:d7:3f:5c:c4:
-        44:53:c6:1c:09:1a:f7:f6:27:3e:d2:73:ce:e9:37:ca:86:8a:
-        58:cc:47:0b:5c:c9:58:12:92:88:4e:6b:13:f9:b4:44:db:9c:
-        e3:f2:0a:61:8e:f8:49:59:44:35:ba:7d:b8:eb:6c:ea:72:e3:
-        cf:39:12:fc:df:08:af:b5:67:91:08:06:f6:2c:69:e9:de:b6:
-        a4:95:0a:30:72:bc:0e:f4:72:ab:0b:bc:68:ad:90:cf:c7:2d:
-        71:6e:4f:9f
------BEGIN CERTIFICATE REQUEST-----
-MIIC3DCCAcQCAQAwgZYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTESMBAGA1UE
-BxMJUGFsbyBBbHRvMRUwEwYDVQQKEwxPcGVuIHZTd2l0Y2gxHzAdBgNVBAsTFk9w
-ZW4gdlN3aXRjaCBjZXJ0aWZpZXIxLjAsBgNVBAMTJU9wZW4gdlN3aXRjaCBjZXJ0
-aWZpY2F0ZSBmb3IgdGVzdHBraTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwCpce2Eh2VzLmTdeEhnrYDLekE5wjvNUBlBCB91+3cLoehcZccsrMKtX+
-zJQLVF6uQP3ZwcyLWH6Hc16smBfyk7TN190SWbeOMdhjyXoUJ/ZnZMuPsdTBPL4w
-4gge4tsSmyNTn2tGmwhGgG+J9XeIuOBIib4OR8VeZCh+w/MQy+KVIGqBehTjj+i4
-0/kxspgMpl6f6iWJNCLy/KFdKy0KQIV6/09eWlFy8rgDF9vSPkB/G2vxreiu0zPU
-rZwF1LEfUx1FGFAxKIhWk6f5ss2Q1ZHcFKkzLQuMdH2UHr5Y1/4ebaWlO+Jm8Ab5
-2VwsZvt7hTgTZf84uhtZ9AigSQM/AgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAQEA
-btd8C5F1mjYlRM+bDGuPpe3yT8y9n/1D3bQnCg1hTFSZsEypUj45k2hj4RX8RydU
-FwjrsGphYdjV1JX8HlC6an97M4eptCdr9BIFw5DKv5jqrtIeJrvNI804yPChA57X
-4eTZwOqwMVy6fFPRXiPC6HRXC/sjeYlaiHSWN346Bo12/uDw0Y5go30MmRago+z5
-YsB9IhgzFraoMTkHbo/XP1zERFPGHAka9/YnPtJzzuk3yoaKWMxHC1zJWBKSiE5r
-E/m0RNuc4/IKYY74SVlENbp9uOts6nLjzzkS/N8Ir7VnkQgG9ixp6d62pJUKMHK8
-DvRyqwu8aK2Qz8ctcW5Pnw==
------END CERTIFICATE REQUEST-----

diff --git a/tests/vconn.at b/tests/vconn.at
index 2f64f820211ae477642af9cc1374fda9ef3dc425..ae095b00b5eebc19d0e25f3298ea8fb8b0dea1f9 100644 (file)
--- a/tests/vconn.at
+++ b/tests/vconn.at
@@ -13,7 +13,7 @@ m4_define([TEST_VCONN_CLASS],
      [AT_SETUP([$1 vconn - m4_bpatsubst(testname, [-], [ ])])
       m4_if([$1], [ssl], [
         AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
      [AT_SETUP([$1 vconn - m4_bpatsubst(testname, [-], [ ])])
       m4_if([$1], [ssl], [
         AT_SKIP_IF([test "$HAVE_OPENSSL" = no])

-        AT_CHECK([cp $abs_top_srcdir/tests/testpki*.pem .])])
+        AT_CHECK([cp $abs_top_builddir/tests/testpki*.pem .])])

       AT_CHECK([test-vconn testname $1], [0], [], [ignore])
       AT_CLEANUP])])
 
       AT_CHECK([test-vconn testname $1], [0], [], [ignore])
       AT_CLEANUP])])