From 2566e705bc3e016a33ad60e87db7548535daa4eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 8 Nov 2018 19:35:37 +0000 Subject: Rename dcpsignerthumb -> dcpthumb. --- tools/dcpsignerthumb.cc | 83 ------------------------------------------------- tools/dcpthumb.cc | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/wscript | 2 +- 3 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 tools/dcpsignerthumb.cc create mode 100644 tools/dcpthumb.cc (limited to 'tools') diff --git a/tools/dcpsignerthumb.cc b/tools/dcpsignerthumb.cc deleted file mode 100644 index 73f70f2d..00000000 --- a/tools/dcpsignerthumb.cc +++ /dev/null @@ -1,83 +0,0 @@ -/* - Copyright (C) 2017 Carl Hetherington - - This file is part of libdcp. - - libdcp is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - libdcp is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with libdcp. If not, see . - - In addition, as a special exception, the copyright holders give - permission to link the code of portions of this program with the - OpenSSL library under certain conditions as described in each - individual source file, and distribute linked combinations - including the two. - - You must obey the GNU General Public License in all respects - for all of the code used other than OpenSSL. If you modify - file(s) with this exception, you may extend this exception to your - version of the file(s), but you are not obligated to do so. If you - do not wish to do so, delete this exception statement from your - version. If you delete this exception statement from all source - files in the program, then also delete it here. -*/ - -#include "encrypted_kdm.h" -#include "decrypted_kdm.h" -#include "util.h" -#include "exceptions.h" -#include -#include - -using std::string; -using std::cout; -using std::cerr; -using boost::optional; - -static void -help (string n) -{ - cerr << "Syntax: " << n << " [OPTION] ]\n" - << " -h, --help show this help\n"; -} - -int -main (int argc, char* argv[]) -{ - int option_index = 0; - while (true) { - struct option long_options[] = { - { "help", no_argument, 0, 'h' }, - { 0, 0, 0, 0 } - }; - - int c = getopt_long (argc, argv, "hp:", long_options, &option_index); - - if (c == -1) { - break; - } - - switch (c) { - case 'h': - help (argv[0]); - exit (EXIT_SUCCESS); - } - } - - if (optind >= argc) { - help (argv[0]); - exit (EXIT_FAILURE); - } - - cout << dcp::Certificate(dcp::file_to_string(argv[optind])).thumbprint() << "\n"; - return 0; -} diff --git a/tools/dcpthumb.cc b/tools/dcpthumb.cc new file mode 100644 index 00000000..73f70f2d --- /dev/null +++ b/tools/dcpthumb.cc @@ -0,0 +1,83 @@ +/* + Copyright (C) 2017 Carl Hetherington + + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + libdcp is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. +*/ + +#include "encrypted_kdm.h" +#include "decrypted_kdm.h" +#include "util.h" +#include "exceptions.h" +#include +#include + +using std::string; +using std::cout; +using std::cerr; +using boost::optional; + +static void +help (string n) +{ + cerr << "Syntax: " << n << " [OPTION] ]\n" + << " -h, --help show this help\n"; +} + +int +main (int argc, char* argv[]) +{ + int option_index = 0; + while (true) { + struct option long_options[] = { + { "help", no_argument, 0, 'h' }, + { 0, 0, 0, 0 } + }; + + int c = getopt_long (argc, argv, "hp:", long_options, &option_index); + + if (c == -1) { + break; + } + + switch (c) { + case 'h': + help (argv[0]); + exit (EXIT_SUCCESS); + } + } + + if (optind >= argc) { + help (argv[0]); + exit (EXIT_FAILURE); + } + + cout << dcp::Certificate(dcp::file_to_string(argv[optind])).thumbprint() << "\n"; + return 0; +} diff --git a/tools/wscript b/tools/wscript index f54646b4..96c31fdc 100644 --- a/tools/wscript +++ b/tools/wscript @@ -44,7 +44,7 @@ def build(bld): obj.source = 'dcpinfo.cc common.cc' obj.target = 'dcpinfo' - for f in ['dumpsub', 'decryptmxf', 'kdm', 'signerthumb']: + for f in ['dumpsub', 'decryptmxf', 'kdm', 'thumb']: obj = bld(features='cxx cxxprogram') obj.use = ['libdcp%s' % bld.env.API_VERSION] obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL' -- cgit v1.2.3