exiftool-vendored.exe 12.26.0 → 12.33.0

package/bin/exiftool_files/exiftool.pl

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.26';
+my $version = '12.33';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -1619,7 +1619,7 @@ if (@newValues) {
             next;
         }
         my %opts = ( Shift => 0 );  # shift values if possible instead of adding/deleting
-        # allow writing of 'unsafe' tags unless specified by wildcard
+        # allow writing of 'Unsafe' tags unless specified by wildcard
         $opts{Protected} = 1 unless $tag =~ /[?*]/;
 
         if ($tag =~ s/<// and defined $newVal) {
@@ -1954,10 +1954,19 @@ sub GetImageInfo($$)
     my $pipe = $file;
     if ($doUnzip) {
         # pipe through gzip or bzip2 if necessary
-        if ($file =~ /\.gz$/i) {
-            $pipe = qq{gzip -dc "$file" |};
-        } elsif ($file =~ /\.bz2$/i) {
-            $pipe = qq{bzip2 -dc "$file" |};
+        if ($file =~ /\.(gz|bz2)$/i) {
+            my $type = lc $1;
+            if ($file =~ /[^-_.'A-Za-z0-9\/\\]/) {
+                Warn "Error: Insecure zip file name. Skipped\n";
+                EFile($file);
+                ++$countBad;
+                return;
+            }
+            if ($type eq 'gz') {
+                $pipe = qq{gzip -dc "$file" |};
+            } else {
+                $pipe = qq{bzip2 -dc "$file" |};
+            }
         }
     }
     # evaluate -if expression for conditional processing
@@ -2276,7 +2285,7 @@ TAG:    foreach $tag (@foundTags) {
                     # avoid extracting Protected binary tags (eg. data blocks) [insider information]
                     my $lcTag = lc $tag;
                     $lcTag =~ s/ .*//;
-                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag};
+                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag} or ($$et{OPTIONS}{RequestAll} || 0) > 2;
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
                 next unless defined $val;
@@ -3241,7 +3250,8 @@ sub FormatXML($$$)
     } elsif (ref $val eq 'HASH') {
         $gt = " rdf:parseType='Resource'>";
         my $val2 = '';
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             # (some variable-namespace XML structure fields may have a different group)
             my $tok = /:/ ? $_ : ($grp . ':' . $_);
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
@@ -3318,7 +3328,8 @@ sub FormatJSON($$$)
     } elsif (ref $val eq 'HASH') {
         my ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
         print $fp $bra;
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             print $fp ',' if $comma;
             my $key = EscapeJSON($_, 1);
             print $fp qq(\n$ind  $key$sep );
@@ -4483,47 +4494,48 @@ DESCRIPTION
 
       File Types
       ------------+-------------+-------------+-------------+------------
-      360   r/w   | DPX   r     | ITC   r     | NUMBERS r   | RAM   r
-      3FR   r     | DR4   r/w/c | J2C   r     | O     r     | RAR   r
-      3G2   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RAW   r/w
-      3GP   r/w   | DV    r     | JP2   r/w   | ODS   r     | RIFF  r
-      A     r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RSRC  r
-      AA    r     | DVR-MS r    | JSON  r     | OFR   r     | RTF   r
-      AAE   r     | DYLIB r     | JXL   r     | OGG   r     | RW2   r/w
-      AAX   r/w   | EIP   r     | K25   r     | OGV   r     | RWL   r/w
-      ACR   r     | EPS   r/w   | KDC   r     | ONP   r     | RWZ   r
-      AFM   r     | EPUB  r     | KEY   r     | OPUS  r     | RM    r
-      AI    r/w   | ERF   r/w   | LA    r     | ORF   r/w   | SEQ   r
-      AIFF  r     | EXE   r     | LFP   r     | ORI   r/w   | SKETCH r
-      APE   r     | EXIF  r/w/c | LNK   r     | OTF   r     | SO    r
-      ARQ   r/w   | EXR   r     | LRV   r/w   | PAC   r     | SR2   r/w
-      ARW   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRF   r
-      ASF   r     | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SRW   r/w
-      AVI   r     | FFF   r/w   | MACOS r     | PCD   r     | SVG   r
-      AVIF  r/w   | FITS  r     | MAX   r     | PCX   r     | SWF   r
-      AZW   r     | FLA   r     | MEF   r/w   | PDB   r     | THM   r/w
-      BMP   r     | FLAC  r     | MIE   r/w/c | PDF   r/w   | TIFF  r/w
-      BPG   r     | FLIF  r/w   | MIFF  r     | PEF   r/w   | TORRENT r
-      BTF   r     | FLV   r     | MKA   r     | PFA   r     | TTC   r
-      CHM   r     | FPF   r     | MKS   r     | PFB   r     | TTF   r
-      COS   r     | FPX   r     | MKV   r     | PFM   r     | TXT   r
-      CR2   r/w   | GIF   r/w   | MNG   r/w   | PGF   r     | VCF   r
-      CR3   r/w   | GPR   r/w   | MOBI  r     | PGM   r/w   | VRD   r/w/c
-      CRM   r/w   | GZ    r     | MODD  r     | PLIST r     | VSD   r
-      CRW   r/w   | HDP   r/w   | MOI   r     | PICT  r     | WAV   r
-      CS1   r/w   | HDR   r     | MOS   r/w   | PMP   r     | WDP   r/w
-      CSV   r     | HEIC  r/w   | MOV   r/w   | PNG   r/w   | WEBP  r
-      CZI   r     | HEIF  r/w   | MP3   r     | PPM   r/w   | WEBM  r
-      DCM   r     | HTML  r     | MP4   r/w   | PPT   r     | WMA   r
-      DCP   r/w   | ICC   r/w/c | MPC   r     | PPTX  r     | WMV   r
-      DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WTV   r
-      DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | WV    r
-      DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | X3F   r/w
-      DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XCF   r
-      DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
-      DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XLSX  r
-      DOC   r     | INX   r     | NEF   r/w   | RA    r     | XMP   r/w/c
-      DOCX  r     | ISO   r     | NRW   r/w   | RAF   r/w   | ZIP   r
+      360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RIFF  r
+      3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RSRC  r
+      3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RTF   r
+      3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RW2   r/w
+      A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWL   r/w
+      AA    r     | DYLIB r     | K25   r     | OGV   r     | RWZ   r
+      AAE   r     | EIP   r     | KDC   r     | ONP   r     | RM    r
+      AAX   r/w   | EPS   r/w   | KEY   r     | OPUS  r     | SEQ   r
+      ACR   r     | EPUB  r     | LA    r     | ORF   r/w   | SKETCH r
+      AFM   r     | ERF   r/w   | LFP   r     | ORI   r/w   | SO    r
+      AI    r/w   | EXE   r     | LIF   r     | OTF   r     | SR2   r/w
+      AIFF  r     | EXIF  r/w/c | LNK   r     | PAC   r     | SRF   r
+      APE   r     | EXR   r     | LRV   r/w   | PAGES r     | SRW   r/w
+      ARQ   r/w   | EXV   r/w/c | M2TS  r     | PBM   r/w   | SVG   r
+      ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCD   r     | SWF   r
+      ASF   r     | FFF   r/w   | MACOS r     | PCX   r     | THM   r/w
+      AVI   r     | FITS  r     | MAX   r     | PDB   r     | TIFF  r/w
+      AVIF  r/w   | FLA   r     | MEF   r/w   | PDF   r/w   | TORRENT r
+      AZW   r     | FLAC  r     | MIE   r/w/  | PEF   r/w   | TTC   r
+      BMP   r     | FLIF  r/w   | MIFF  r   c | PFA   r     | TTF   r
+      BPG   r     | FLV   r     | MKA   r     | PFB   r     | TXT   r
+      BTF   r     | FPF   r     | MKS   r     | PFM   r     | VCF   r
+      CHM   r     | FPX   r     | MKV   r     | PGF   r     | VRD   r/w/c
+      COS   r     | GIF   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
+      CR2   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
+      CR3   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
+      CRM   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r
+      CRW   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
+      CS1   r/w   | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
+      CSV   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
+      CZI   r     | HTML  r     | MP4   r/w   | PPTX  r     | WTV   r
+      DCM   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WV    r
+      DCP   r/w   | ICS   r     | MPG   r     | PSB   r/w   | X3F   r/w
+      DCR   r     | IDML  r     | MPO   r/w   | PSD   r/w   | XCF   r
+      DFONT r     | IIQ   r/w   | MQV   r/w   | PSP   r     | XLS   r
+      DIVX  r     | IND   r/w   | MRC   r     | QTIF  r/w   | XLSX  r
+      DJVU  r     | INSP  r/w   | MRW   r/w   | R3D   r     | XMP   r/w/c
+      DLL   r     | INSV  r     | MXF   r     | RA    r     | ZIP   r
+      DNG   r/w   | INX   r     | NEF   r/w   | RAF   r/w   |
+      DOC   r     | ISO   r     | NRW   r/w   | RAM   r     |
+      DOCX  r     | ITC   r     | NUMBERS r   | RAR   r     |
+      DPX   r     | J2C   r     | O     r     | RAW   r/w   |
 
       Meta Information
       ----------------------+----------------------+---------------------
@@ -4728,12 +4740,13 @@ OPTIONS
          names, prefixed by optional family numbers, and separated colons.
          If no group name is specified, the tag is created in the preferred
          group, and updated in any other location where a same-named tag
-         already exists. The preferred group is the first group in the
-         following list where *TAG* is valid: 1) EXIF, 2) IPTC, 3) XMP.
+         already exists. The preferred group in JPEG and TIFF-format images
+         is the first group in the following list where *TAG* is valid: 1)
+         EXIF, 2) IPTC, 3) XMP.
 
          The wildcards "*" and "?" may be used in tag names to assign the
          same value to multiple tags. When specified with wildcards,
-         "unsafe" tags are not written. A tag name of "All" is equivalent to
+         "Unsafe" tags are not written. A tag name of "All" is equivalent to
          "*" (except that it doesn't require quoting, while arguments with
          wildcards do on systems with shell globbing), and is often used
          when deleting all metadata (ie. "-All=") or an entire group (eg.
@@ -4888,9 +4901,9 @@ OPTIONS
          Notes:
 
          1) Some tags (generally tags which may affect the appearance of the
-         image) are considered "unsafe" to write, and are only copied if
+         image) are considered "Unsafe" to write, and are only copied if
          specified explicitly (ie. no wildcards). See the tag name
-         documentation for more details about "unsafe" tags.
+         documentation for more details about "Unsafe" tags.
 
          2) Be aware of the difference between excluding a tag from being
          copied (--*TAG*), and deleting a tag (-*TAG*=). Excluding a tag
@@ -4988,7 +5001,7 @@ OPTIONS
              exiftool -@ out.args -sep ", " dst.jpg
 
          Note: Be careful when copying information with this technique since
-         it is easy to write tags which are normally considered "unsafe".
+         it is easy to write tags which are normally considered "Unsafe".
          For instance, the FileName and Directory tags are excluded in the
          example above to avoid renaming and moving the destination file.
          Also note that the second command above will produce warning
@@ -5008,9 +5021,9 @@ OPTIONS
          output. By default, list items are separated by a newline when
          extracted with the -b option, but this may be changed (see the -sep
          option for details). May be combined with -j, -php or -X to extract
-         binary data in JSON, PHP or XML format, but note that "unsafe" tags
-         must be specified explicitly to be extracted as binary in these
-         formats.
+         binary data in JSON, PHP or XML format, but note that "Unsafe" tags
+         are not extracted as binary unless they are specified explicitly or
+         the API RequestAll option is set to 3 or higher.
 
          With a leading double dash (--b or --binary), tags which contain
          binary data are suppressed in the output when reading.
@@ -5214,7 +5227,7 @@ OPTIONS
          collapsing adjacent identical group names, but this can be avoided
          by placing a colon before the first family number (eg. -g:3:1). Use
          the -listg option to list group names for a specified family. The
-         SavePath and SaveFormat API options are automatically enabled if
+         API SavePath and SaveFormat options are automatically enabled if
          the respective family 5 or 6 group names are requested. See the API
          GetGroup documentation for more information.
 
@@ -5420,7 +5433,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.26 --
+             -- Generated by ExifTool 12.33 --
              File: a.jpg - 2003:10:31 15:44:19
              (f/5.6, 1/60s, ISO 100)
              File: b.jpg - 2006:05:23 11:57:38
@@ -5437,7 +5450,7 @@ OPTIONS
          If a specified tag does not exist, a minor warning is issued and
          the line with the missing tag is not printed. However, the -f
          option may be used to set the value of missing tags to '-' (but
-         this may be configured via the MissingTagValue API option), or the
+         this may be configured via the API MissingTagValue option), or the
          -m option may be used to ignore minor warnings and leave the
          missing values empty. Alternatively, -q -q may be used to simply
          suppress the warning messages.
@@ -5742,9 +5755,9 @@ OPTIONS
 
          Note: This output is NOT the same as XMP because it uses
          dynamically-generated property names corresponding to the ExifTool
-         tag names, and not the standard XMP properties. To write XMP
-         instead, use the -o option with an XMP extension for the output
-         file.
+         tag names with ExifTool family 1 group names as namespaces, and not
+         the standard XMP properties and namespaces. To write XMP instead,
+         use the -o option with an XMP extension for the output file.
 
    Processing control
     -a, --a (-duplicates, --duplicates)
@@ -6363,7 +6376,7 @@ OPTIONS
     -efile[*NUM*][!] *ERRFILE*
          Save the names of files giving errors (*NUM* missing or 1), files
          that were unchanged (*NUM* is 2), files that fail the -if condition
-         (*NUM* is 4), or any combination thereof (by summing *NUM*, eg.
+         (*NUM* is 4), or any combination thereof by summing *NUM* (eg.
          -efile3 is the same has having both -efile and -efile2 options with
          the same *ERRFILE*). By default, file names are appended to any
          existing *ERRFILE*, but *ERRFILE* is overwritten if an exclamation

package/bin/exiftool_files/fmt_files/gpx.fmt

@@ -13,7 +13,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

package/bin/exiftool_files/fmt_files/gpx_wpt.fmt

@@ -14,7 +14,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

package/bin/exiftool_files/lib/Image/ExifTool/BuildTagLookup.pm

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.44';
+$VERSION = '3.45';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -68,6 +68,7 @@ my %tweakOrder = (
     IPTC    => 'Exif',  # put IPTC after EXIF,
     GPS     => 'XMP',   # etc...
     Composite => 'Extra',
+    CBOR    => 'JSON',
     GeoTiff => 'GPS',
     CanonVRD=> 'CanonCustom',
     DJI     => 'Casio',
@@ -459,7 +460,7 @@ According to the specification, integer-format QuickTime date/time tags
 should be stored as UTC.  Unfortunately, digital cameras often store local
 time values instead (presumably because they don't know the time zone).  For
 this reason, by default ExifTool does not assume a time zone for these
-values.  However, if the L<QuickTimeUTC|../ExifTool.html#QuickTimeUTC> API option is set, then ExifTool will
+values.  However, if the API L<QuickTimeUTC|../ExifTool.html#QuickTimeUTC> option is set, then ExifTool will
 assume these values are properly stored as UTC, and will convert them to
 local time when extracting.
 
@@ -2117,7 +2118,7 @@ sub WriteTagNames($$)
         $short = $$shortName{$tableName};
         my @names = split ' ', $short;
         my $class = shift @names;
-        if (@names) {
+        if (@names and $class ne 'Other') {
             # add heading for tables without a Main
             unless ($heading eq $class) {
                 $heading = $class;
@@ -2145,6 +2146,13 @@ sub WriteTagNames($$)
         $short = $$shortName{$tableName};
         $short = $tableName unless $short;
         $url = "$short.html";
+        # handle various tables in "Other.pm"
+        if ($short =~ /^Other (.*)/) {
+            $short = $1;
+            $url = 'Other.html#' . $1;
+        } else {
+            $url = "$short.html";
+        }
         print HTMLFILE "<a href='${url}'>$short</a>";
         ++$count;
     }

package/bin/exiftool_files/lib/Image/ExifTool/CBOR.pm

@@ -0,0 +1,331 @@
+#------------------------------------------------------------------------------
+# File:         CBOR.pm
+#
+# Description:  Read CBOR format metadata
+#
+# Revisions:    2021-09-30 - P. Harvey Created
+#
+# References:   1) https://c2pa.org/public-draft/
+#               2) https://datatracker.ietf.org/doc/html/rfc7049
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::CBOR;
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::JSON;
+
+$VERSION = '1.01';
+
+sub ProcessCBOR($$$);
+sub ReadCBORValue($$$$);
+
+# optional CBOR type code
+my %cborType6 = (
+    0 => 'date/time string',
+    1 => 'epoch-based date/time',
+    2 => 'positive bignum',
+    3 => 'negative bignum',
+    4 => 'decimal fraction',
+    5 => 'bigfloat',
+    21 => 'expected base64url encoding',
+    22 => 'expected base64 encoding',
+    23 => 'expected base16 encoding',
+    24 => 'encoded CBOR data',
+    32 => 'URI',
+    33 => 'base64url',
+    34 => 'base64',
+    35 => 'regular expression',
+    36 => 'MIME message',
+    55799 => 'CBOR magic number',
+);
+
+my %cborType7 = (
+    20 => 'False',
+    21 => 'True',
+    22 => 'null',
+    23 => 'undef',
+);
+
+%Image::ExifTool::CBOR::Main = (
+    GROUPS => { 0 => 'JUMBF', 1 => 'CBOR', 2 => 'Other' },
+    VARS => { NO_ID => 1 },
+    PROCESS_PROC => \&ProcessCBOR,
+    NOTES => q{
+        The tags below are extracted from CBOR (Concise Binary Object
+        Representation) metadata.  The C2PA specification uses this format for some
+        metadata.  As well as these tags, ExifTool will read any existing tags.
+    },
+    'dc:title'      => 'Title',
+    'dc:format'     => 'Format',
+    # my sample file has the following 2 tags in CBOR, but they should be JSON
+    authorName      => { Name => 'AuthorName', Groups => { 2 => 'Author' } },
+    authorIdentifier=> { Name => 'AuthorIdentifier', Groups => { 2 => 'Author' } },
+    documentID      => { },
+    instanceID      => { },
+    thumbnailHash   => { List => 1 },
+    thumbnailUrl    => { Name => 'ThumbnailURL' },
+    relationship    => { }
+);
+
+#------------------------------------------------------------------------------
+# Read CBOR value
+# Inputs: 0) ExifTool ref, 1) data ref, 2) position in data, 3) data end
+# Returns: 0) value, 1) error string, 2) new data position
+sub ReadCBORValue($$$$)
+{
+    my ($et, $dataPt, $pos, $end) = @_;
+    return(undef, 'Truncated CBOR data', $pos) if $pos >= $end;
+    my $verbose = $$et{OPTIONS}{Verbose};
+    my $indent = $$et{INDENT};
+    my $dumpStart = $pos;
+    my $fmt = Get8u($dataPt, $pos++);
+    my $dat = $fmt & 0x1f;
+    my ($num, $val, $err, $size);
+    $fmt >>= 5;
+    if ($dat < 24) {
+        $num = $dat;
+    } elsif ($dat == 31) {  # indefinite count (not used in C2PA)
+        $num = -1;  # (flag for indefinite count)
+        $et->VPrint(1, "$$et{INDENT} (indefinite count):\n");
+    } else {
+        my $format = { 24 => 'int8u', 25 => 'int16u', 26 => 'int32u', 27 => 'int64u' }->{$dat};
+        return(undef, "Invalid CBOR integer type $dat", $pos) unless $format;
+        $size = Image::ExifTool::FormatSize($format);
+        return(undef, 'Truncated CBOR integer value', $pos) if $pos + $size > $end;
+        $num = ReadValue($dataPt, $pos, $format, 1, $size);
+        $pos += $size;
+    }
+    my $pre = '';
+    if (defined $$et{cbor_pre} and $fmt != 6) {
+        $pre = $$et{cbor_pre};
+        delete $$et{cbor_pre};
+    }
+    if ($fmt == 0) {            # positive integer
+        $val = $num;
+        $et->VPrint(1, "$$et{INDENT} ${pre}int+: $val\n");
+    } elsif ($fmt == 1) {       # negative integer
+        $val = -1 * $num;
+        $et->VPrint(1, "$$et{INDENT} ${pre}int-: $val\n");
+    } elsif ($fmt == 2 or $fmt == 3) {  # byte/UTF8 string
+        return(undef, 'Truncated CBOR string value', $pos) if $pos + $num > $end;
+        if ($num < 0) { # (should not happen in C2PA)
+            my $string = '';
+            $$et{INDENT} .= '  ';
+            for (;;) {
+                ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+                return(undef, $err, $pos) if $err;
+                last if not defined $val;   # hit the break?
+                # (note: strictly we should be checking that this was a string we read)
+                $string .= $val;
+            }
+            $$et{INDENT} = $indent;
+            return($string, undef, $pos);   # return concatenated byte/text string
+        } else {
+            $val = substr($$dataPt, $pos, $num);
+        }
+        $pos += $num;
+        if ($fmt == 2) {    # (byte string)
+            $et->VPrint(1, "$$et{INDENT} ${pre}byte: <binary data ".length($val)." bytes>\n");
+            my $dat = $val;
+            $val = \$dat;   # use scalar reference for binary data
+        } else {            # (text string)
+            $val = $et->Decode($val, 'UTF8');
+            $et->VPrint(1, "$$et{INDENT} ${pre}text: '${val}'\n");
+        }
+    } elsif ($fmt == 4 or $fmt == 5) {  # list/hash
+        if ($fmt == 4) {
+            $et->VPrint(1, "$$et{INDENT} ${pre}list: <$num elements>\n");
+        } else {
+            $et->VPrint(1, "$$et{INDENT} ${pre}hash: <$num pairs>\n");
+            $num *= 2;
+        }
+        $$et{INDENT} .= '  ';
+        my $i = 0;
+        my @list;
+        Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+            Start   => $dumpStart,
+            DataPos => $$et{cbor_datapos},
+            Prefix  => $$et{INDENT},
+        ) if $verbose > 2;
+        while ($num) {
+            $$et{cbor_pre} = "$i) ";
+            if ($fmt == 4) {
+                ++$i;
+            } elsif ($num & 0x01) {
+                $$et{cbor_pre} = ' ' x length($$et{cbor_pre});
+                ++$i;
+            }
+            ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+            return(undef, $err, $pos) if $err;
+            if (not defined $val) {
+                return(undef, 'Unexpected list terminator', $pos) unless $num < 0;
+                last;
+            }
+            push @list, $val;
+            --$num;
+        }
+        $dumpStart = $pos;
+        $$et{INDENT} = $indent;
+        if ($fmt == 5) {
+            my ($i, @keys);
+            my %hash = ( _ordered_keys_ => \@keys );
+            for ($i=0; $i<@list-1; $i+=2) {
+                $hash{$list[$i]} = $list[$i+1];
+                push @keys, $list[$i];  # save ordered list of keys
+            }
+            $val = \%hash;
+        } else {
+            $val = \@list;
+        }
+    } elsif ($fmt == 6) {       # optional tag
+        if ($verbose) {
+            my $str = "$num (" . ($cborType6{$num} || 'unknown') . ')';
+            my $spc = $$et{cbor_pre} ? (' ' x length $$et{cbor_pre}) : '';
+            $et->VPrint(1, "$$et{INDENT} $spc<CBOR optional type $str>\n");
+            Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+                Start   => $dumpStart,
+                DataPos => $$et{cbor_datapos},
+                Prefix  => $$et{INDENT} . '  ',
+            ) if $verbose > 2;
+        }
+        # read next value (note: in the case of multiple tags,
+        # this nesting will apply the tags in the correct order)
+        ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+        $dumpStart = $pos;
+        # convert some values according to the optional tag number (untested)
+        if ($num == 0 and not ref $val) {       # date/time string
+            require Image::ExifTool::XMP;
+            $val = Image::ExifTool::XMP::ConvertXMPDate($val);
+        } elsif ($num == 1 and not ref $val) {  # epoch-based date/time
+            if (Image::ExifTool::IsFloat($val)) {
+                my $dec = ($val == int($val)) ? undef : 6;
+                $val = Image::ExifTool::ConvertUnixTime($val, 1, $dec);
+            }
+        } elsif (($num == 2 or $num == 3) and ref($val) eq 'SCALAR') { # pos/neg bignum
+            my $big = 0;
+            $big = 256 * $big + Get8u($val,$_) foreach 0..(length($$val) - 1);
+            $val = $num==2 ? $big : -$big;
+        } elsif (($num == 4 or $num == 5) and # decimal fraction or bigfloat
+            ref($val) eq 'ARRAY' and @$val == 2 and
+            Image::ExifTool::IsInt($$val[0]) and Image::ExifTool::IsInt($$val[1]))
+        {
+            $val = $$val[1] * ($num == 4 ? 10 : 2) ** $$val[0];
+        }
+    } elsif ($fmt == 7) {       
+        if ($dat == 31) {
+            undef $val; # "break" = end of indefinite array/hash (not used in C2PA)
+        } elsif ($dat < 24) {
+            $val = $cborType7{$num};
+            $val = "Unknown ($val)" unless defined $val;
+        } elsif ($dat == 25) {  # half-precision float
+            my $exp = ($num >> 10) & 0x1f;
+            my $mant = $num & 0x3ff;
+            if ($exp == 0) {
+                $val = $mant ** -24;
+                $val *= -1 if $num & 0x8000;
+            } elsif (exp != 31) {
+                $val = ($mant + 1024) ** ($exp - 25);
+                $val *= -1 if $num & 0x8000;
+            } else {
+                $val = $mant == 0 ? '<inf>' : '<nan>';
+            }
+        } elsif ($dat == 26) {  # float
+            $val = GetFloat($dataPt, $pos - $size);
+        } elsif ($dat == 27) {  # double
+            $val = GetDouble($dataPt, $pos - $size);
+        } else {
+            return(undef, "Invalid CBOR type 7 variant $num", $pos);
+        }
+        $et->VPrint(1, "$$et{INDENT} ${pre}typ7: ".(defined $val ? $val : '<break>')."\n");
+    } else {
+        return(undef, "Unknown CBOR format $fmt", $pos);
+    }
+    Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+        Start   => $dumpStart,
+        DataPos => $$et{cbor_datapos},
+        Prefix  => $$et{INDENT} . '  ',
+        MaxLen  => $verbose < 5 ? ($verbose == 3 ? 96 : 2048) : undef,
+    ) if $verbose > 2;
+    return($val, $err, $pos);
+}
+
+#------------------------------------------------------------------------------
+# Read CBOR box
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessCBOR($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $pos = $$dirInfo{DirStart};
+    my $end = $pos + $$dirInfo{DirLen};
+    my ($val, $err, $tag, $i);
+
+    $et->VerboseDir('CBOR', undef, $$dirInfo{DirLen});
+
+    $$et{cbor_datapos} = $$dirInfo{DataPos} + $$dirInfo{Base};
+
+    while ($pos < $end) {
+        ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+        $err and $et->Warn($err), last;
+        if (ref $val eq 'HASH') {
+            foreach $tag (@{$$val{_ordered_keys_}}) {
+                Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, $tag, $$val{$tag});
+            }
+        } elsif (ref $val eq 'ARRAY') {
+            for ($i=0; $i<@$val; ++$i) {
+                Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, "Item$i", $$val[$i]);
+            }
+        } elsif ($val eq '0') {
+            $et->VPrint(1, "$$et{INDENT} <CBOR end>\n");
+            last;   # (treat as padding)
+        } else {
+            $et->VPrint(1, "$$et{INDENT} Unknown value: $val\n");
+        }
+    }
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::CBOR - Read CBOR format metadata
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool read Concise
+Binary Object Representation (CBOR) formatted metadata, used by the C2PA
+specification.
+
+=head1 AUTHOR
+
+Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://c2pa.org/public-draft/>
+
+=item L<https://datatracker.ietf.org/doc/html/rfc7049>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/CBOR Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+