diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
| commit | 2e93ca3670e5581b5523f60130b38594de10d6c3 (patch) | |
| tree | 6ed18ed07bccf77b2d172ef7681fce981956815f /test/encryption_test.cc | |
| parent | 9ed550de7b98ca2f8467dd134a9c0ad7f1868f23 (diff) | |
| parent | 447cc7ddec5ace7bb47df35192ef02e7c19bf9b3 (diff) | |
Merge master; MXF subtitle stuff not included.
Diffstat (limited to 'test/encryption_test.cc')
| -rw-r--r-- | test/encryption_test.cc | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc index a0633b07..b4a89544 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -64,15 +64,16 @@ BOOST_AUTO_TEST_CASE (encryption_test) boost::filesystem::create_directories ("build/test/DCP/bar"); dcp::DCP d ("build/test/DCP/bar"); + /* Use test/ref/crypt so this test is repeatable */ dcp::CertificateChain chain; - chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/ca.self-signed.pem")))); - chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/intermediate.signed.pem")))); - chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/leaf.signed.pem")))); + chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("test/ref/crypt/ca.self-signed.pem")))); + chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("test/ref/crypt/intermediate.signed.pem")))); + chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("test/ref/crypt/leaf.signed.pem")))); shared_ptr<dcp::Signer> signer ( new dcp::Signer ( chain, - "build/test/signer/leaf.key" + "test/ref/crypt/leaf.key" ) ); @@ -110,12 +111,21 @@ BOOST_AUTO_TEST_CASE (encryption_test) ); kdm.as_xml ("build/test/bar.kdm.xml"); - system ("xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/bar.kdm.xml"); - system ("xmlsec1 verify " - "--pubkey-cert-pem build/test/signer/leaf.signed.pem " - "--trusted-pem build/test/signer/intermediate.signed.pem " - "--trusted-pem build/test/signer/ca.self-signed.pem " + + int r = system ( + "xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/bar.kdm.xml " + "> build/test/xmllint.log 2>&1 < /dev/null" + ); + + BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); + + r = system ("xmlsec1 verify " + "--pubkey-cert-pem test/ref/crypt/leaf.signed.pem " + "--trusted-pem test/ref/crypt/intermediate.signed.pem " + "--trusted-pem test/ref/crypt/ca.self-signed.pem " "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPublic " "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate " - "build/test/bar.kdm.xml"); + "build/test/bar.kdm.xml > build/test/xmlsec1.log 2>&1 < /dev/null"); + + BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); } |