X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=7472047e87b206003cfd367a3fdfc6ae2e1a2bfc;hb=6b4ab3e7e631fe4b790ab63abecce765df2897db;hp=3eb5ee30e09e06831924988fd7d85e37f9d81ab4;hpb=86ef75d2d857309257086b94434564997976c912;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index 3eb5ee30e..7472047e8 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -35,6 +35,7 @@ #include "rect.h" #include "digester.h" #include "audio_processor.h" +#include "crypto.h" #include "compose.hpp" #include "audio_buffers.h" #include @@ -49,9 +50,6 @@ extern "C" { #include } #include -#ifdef DCPOMATIC_GRAPHICS_MAGICK -#include -#endif #include #include #include @@ -96,6 +94,7 @@ using boost::thread; using boost::optional; using boost::lexical_cast; using boost::bad_lexical_cast; +using boost::scoped_array; using dcp::Size; using dcp::raw_convert; using dcp::locale_convert; @@ -157,18 +156,27 @@ seconds_to_approximate_hms (int s) string ap; - bool const hours = h > 0; - bool const minutes = h < 6 && m > 0; - bool const seconds = h == 0 && m < 10 && s > 0; + bool hours = h > 0; + bool minutes = h < 6 && m > 0; + bool seconds = h == 0 && m < 10 && s > 0; - if (hours) { - if (m > 30 && !minutes) { - /// TRANSLATORS: h here is an abbreviation for hours - ap += locale_convert(h + 1) + _("h"); - } else { - /// TRANSLATORS: h here is an abbreviation for hours - ap += locale_convert(h) + _("h"); + if (m > 30 && !minutes) { + /* round up the hours */ + ++h; + } + if (s > 30 && !seconds) { + /* round up the minutes */ + ++m; + if (m == 60) { + m = 0; + minutes = false; + ++h; } + } + + if (hours) { + /// TRANSLATORS: h here is an abbreviation for hours + ap += locale_convert(h) + _("h"); if (minutes || seconds) { ap += N_(" "); @@ -176,14 +184,8 @@ seconds_to_approximate_hms (int s) } if (minutes) { - /* Minutes */ - if (s > 30 && !seconds) { - /// TRANSLATORS: m here is an abbreviation for minutes - ap += locale_convert(m + 1) + _("m"); - } else { - /// TRANSLATORS: m here is an abbreviation for minutes - ap += locale_convert(m) + _("m"); - } + /// TRANSLATORS: m here is an abbreviation for minutes + ap += locale_convert(m) + _("m"); if (seconds) { ap += N_(" "); @@ -369,10 +371,6 @@ dcpomatic_setup () curl_global_init (CURL_GLOBAL_ALL); -#ifdef DCPOMATIC_GRAPHICS_MAGICK - Magick::InitializeMagick (0); -#endif - ui_thread = boost::this_thread::get_id (); } @@ -448,7 +446,7 @@ digest_head_tail (vector files, boost::uintmax_t size) } boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); - fread (p, 1, this_time, f); + checked_fread (p, this_time, f, files[i]); p += this_time; to_do -= this_time; fclose (f); @@ -469,7 +467,7 @@ digest_head_tail (vector files, boost::uintmax_t size) boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); dcpomatic_fseek (f, -this_time, SEEK_END); - fread (p, 1, this_time, f); + checked_fread (p, this_time, f, files[i]); p += this_time; to_do -= this_time; fclose (f); @@ -574,7 +572,8 @@ valid_image_file (boost::filesystem::path f) return ( ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" || - ext == ".j2c" || ext == ".j2k" || ext == ".jp2" || ext == ".exr" + ext == ".j2c" || ext == ".j2k" || ext == ".jp2" || ext == ".exr" || + ext == ".jpf" ); } @@ -785,3 +784,138 @@ increment_eyes (Eyes e) return EYES_LEFT; } + +void +checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path) +{ + size_t N = fwrite (ptr, 1, size, stream); + if (N != size) { + if (ferror(stream)) { + fclose (stream); + throw FileError (String::compose("fwrite error %1", errno), path); + } else { + fclose (stream); + throw FileError ("Unexpected short write", path); + } + } +} + +void +checked_fread (void* ptr, size_t size, FILE* stream, boost::filesystem::path path) +{ + size_t N = fread (ptr, 1, size, stream); + if (N != size) { + if (ferror(stream)) { + fclose (stream); + throw FileError (String::compose("fread error %1", errno), path); + } else { + fclose (stream); + throw FileError ("Unexpected short read", path); + } + } +} + +#ifdef DCPOMATIC_VARIANT_SWAROOP + +/* Make up a key from the machine UUID */ +dcp::Data +key_from_uuid () +{ + dcp::Data key (dcpomatic::crypto_key_length()); + memset (key.data().get(), 0, key.size()); + string const magic = command_and_read ("dcpomatic2_uuid"); + strncpy ((char *) key.data().get(), magic.c_str(), dcpomatic::crypto_key_length()); + return key; +} + +/* swaroop chain file format: + * + * 0 [int16_t] IV length + * 2 [int16_t] cert #1 length, or 0 for none + * 4 [int16_t] cert #2 length, or 0 for none + * 6 [int16_t] cert #3 length, or 0 for none + * 8 [int16_t] cert #4 length, or 0 for none + * 10 [int16_t] cert #5 length, or 0 for none + * 12 [int16_t] cert #6 length, or 0 for none + * 14 [int16_t] cert #7 length, or 0 for none + * 16 [int16_t] cert #8 length, or 0 for none + * 16 [int16_t] private key length + * 20 IV + * cert #1 + * cert #2 + * cert #3 + * cert #4 + * cert #5 + * cert #6 + * cert #7 + * cert #8 + * private key + */ + +struct __attribute__ ((packed)) Header_ { + int16_t iv_length; + int16_t cert_length[8]; + int16_t private_key_length; +}; + +typedef struct Header_ Header; + +shared_ptr +read_swaroop_chain (boost::filesystem::path path) +{ + dcp::Data data (path); + Header* header = (Header *) data.data().get(); + uint8_t* p = data.data().get() + sizeof(Header); + + dcp::Data iv (p, header->iv_length); + p += iv.size(); + + shared_ptr cc (new dcp::CertificateChain()); + for (int i = 0; i < 8; ++i) { + if (header->cert_length[i] == 0) { + break; + } + dcp::Data c(p, header->cert_length[i]); + p += c.size(); + cc->add (dcp::Certificate(dcpomatic::decrypt(c, key_from_uuid(), iv))); + } + + dcp::Data k (p, header->private_key_length); + cc->set_key (dcpomatic::decrypt(k, key_from_uuid(), iv)); + return cc; +} + +void +write_swaroop_chain (shared_ptr chain, boost::filesystem::path output) +{ + scoped_array buffer (new uint8_t[65536]); + Header* header = (Header *) buffer.get(); + memset (header, 0, sizeof(Header)); + uint8_t* p = buffer.get() + sizeof(Header); + + dcp::Data iv = dcpomatic::random_iv (); + header->iv_length = iv.size (); + memcpy (p, iv.data().get(), iv.size()); + p += iv.size(); + + int N = 0; + BOOST_FOREACH (dcp::Certificate i, chain->root_to_leaf()) { + dcp::Data e = dcpomatic::encrypt (i.certificate(true), key_from_uuid(), iv); + memcpy (p, e.data().get(), e.size()); + p += e.size(); + DCPOMATIC_ASSERT (N < 8); + header->cert_length[N] = e.size (); + ++N; + } + + dcp::Data k = dcpomatic::encrypt (chain->key().get(), key_from_uuid(), iv); + memcpy (p, k.data().get(), k.size()); + p += k.size(); + header->private_key_length = k.size (); + + FILE* f = fopen_boost (output, "wb"); + checked_fwrite (buffer.get(), p - buffer.get(), f, output); + fclose (f); +} + +#endif