/*
- Copyright (C) 2017-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
files in the program, then also delete it here.
*/
-#include "encrypted_kdm.h"
+
+#include "certificate_chain.h"
#include "decrypted_kdm.h"
-#include "util.h"
+#include "encrypted_kdm.h"
#include "exceptions.h"
-#include "certificate_chain.h"
-#include <boost/foreach.hpp>
+#include "util.h"
#include <getopt.h>
-using std::string;
-using std::cout;
+
using std::cerr;
+using std::cout;
+using std::string;
using boost::optional;
+
static void
help (string n)
{
<< " -p, --private-key private key file\n";
}
-static string
-tm_to_string (struct tm t)
-{
- char buffer[64];
- snprintf (buffer, 64, "%02d/%02d/%02d %02d:%02d:%02d", t.tm_mday, t.tm_mon + 1, t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec);
- return buffer;
-}
int
main (int argc, char* argv[])
cout << "Signer chain:\n";
dcp::CertificateChain signer = enc_kdm.signer_certificate_chain ();
- BOOST_FOREACH (dcp::Certificate const & i, signer.root_to_leaf()) {
+ for (auto const& i: signer.root_to_leaf()) {
cout << "\tCertificate:\n";
cout << "\t\tSubject: " << i.subject() << "\n";
cout << "\t\tSubject common name: " << i.subject_common_name() << "\n";
cout << "\t\tSubject organization name: " << i.subject_organization_name() << "\n";
cout << "\t\tSubject organizational unit name: " << i.subject_organizational_unit_name() << "\n";
- cout << "\t\tNot before: " << tm_to_string(i.not_before()) << "\n";
- cout << "\t\tNot after: " << tm_to_string(i.not_after()) << "\n";
+ cout << "\t\tNot before: " << i.not_before().as_string() << "\n";
+ cout << "\t\tNot after: " << i.not_after().as_string() << "\n";
if (i.has_utf8_strings()) {
cout << "\t\tUSES INCORRECT (UTF8) STRING ENCODING\n";
}
try {
dcp::DecryptedKDM dec_kdm (enc_kdm, dcp::file_to_string (private_key_file.get()));
cout << "\nKeys:";
- BOOST_FOREACH (dcp::DecryptedKDMKey i, dec_kdm.keys ()) {
+ for (auto i: dec_kdm.keys()) {
cout << "\n";
cout << "\tID: " << i.id() << "\n";
cout << "\tStandard: " << (i.standard() == dcp::Standard::SMPTE ? "SMPTE" : "Interop") << "\n";
return 0;
}
+catch (dcp::KDMFormatError& e)
+{
+ cerr << "Could not parse KDM file. Is it a valid KDM?" << "\n";
+ exit(EXIT_FAILURE);
+}
catch (std::exception& e)
{
cerr << "Error: " << e.what() << "\n";