Skip to content

Commit

Permalink
Prep for new release - signature files and skeleton suite (digital-pr…
Browse files Browse the repository at this point in the history
  • Loading branch information
sparkhi authored Jun 22, 2023
1 parent d7a1b9b commit d6d279e
Show file tree
Hide file tree
Showing 107 changed files with 11,371 additions and 120,071 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static Collection<Object[]> data() throws IOException, SignatureParseExce
* from the API for the test skeleton suite.
* Following table describes the current puids that are ignored because the identification using current
* signature file does not match the indicated puid in filename
* ---------------- Current signature file V109 ----------------
* ---------------- Current signature file V112 ----------------
* fmt-1062-signature-id-1435.3fr fmt/353 Signature
* fmt-1157-signature-id-1539.nfo
* fmt-1739-signature-id-2077.toast fmt/468 Signature
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ public void should_report_when_there_is_an_extension_mismatch() throws IOExcepti

@Test
public void should_report_correct_version_for_the_binary_and_container_signature() {
assertThat(api.getContainerSignatureVersion(), is("20221102"));
assertThat(api.getContainerSignatureVersion(), is("20230510"));
assertThat(api.getDroidVersion(), is(ResourceBundle.getBundle("options").getString("version_no")));
assertThat(api.getBinarySignatureVersion(), is("109"));
assertThat(api.getBinarySignatureVersion(), is("112"));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
*/
public class DroidAPITestUtils {
public static DroidAPI createApi() throws SignatureParseException {
Path signaturePath = Paths.get("../droid-results/custom_home/signature_files/DROID_SignatureFile_V109.xml");
Path containerPath = Paths.get("../droid-results/custom_home/container_sigs/container-signature-20221102.xml");
Path signaturePath = Paths.get("../droid-results/custom_home/signature_files/DROID_SignatureFile_V112.xml");
Path containerPath = Paths.get("../droid-results/custom_home/container_sigs/container-signature-20230510.xml");
return DroidAPI.getInstance(signaturePath, containerPath); //Create only once instance of Droid.
}
}
8 changes: 8 additions & 0 deletions droid-binary/bin/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Version 6.7.0
* #898 Improvement: Sigtool uses the version of java bundled with Droid on the Windows OS
* #938 Improvement: Internal API result includes whether there is an extension mismatch in identification
* #861 Improvement: CSV export has column headers when there is more than one PUID per file
* #952 Improvement: SHA512 is available as an option for checksums
* #232 Improvement: Moved to using a different zip library for opening the zip archives
* #953 Bugfix: On CLI, -At and -Wt options without any arguments do not analyse archives or web archives

Version 6.6.1
* #898 Bugfix: Use backslash on Windows OS in no profile output
* #900 Bugfix: Failure to consistently output HASH column in CSV
Expand Down
8 changes: 4 additions & 4 deletions droid-binary/bin/Using sigtool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ You can read an existing binary or container signature file, and output a new si

For example, if you ran:
```
sigtool --file "DROID_SignatureFile_V109.xml"
sigtool --file "DROID_SignatureFile_V112.xml"
```
It would write a new XML file to the console. You can pipe this into a new file using your shell. The signature file will be transformed to use the new syntax, e.g.:
```
Expand All @@ -106,7 +106,7 @@ It would write a new XML file to the console. You can pipe this into a new file
```
You can see that it's transformed a binary signature file using container syntax (the default). If we wanted to use the older binary syntax for this transformation, we could write:
```
sigtool --binary --file "DROID_SignatureFile_V109.xml"
sigtool --binary --file "DROID_SignatureFile_V112.xml"
```
It would give this output (snippet):
```
Expand All @@ -125,7 +125,7 @@ It would give this output (snippet):
## Summarise all signatures in a syntax file.
You can obtain a summary of all signatures in a signature file into a tab-delimited format, by specifying the --expression option. For example, running:
```
sigtool --expression --file "DROID_SignatureFile_V109.xml"
sigtool --expression --file "DROID_SignatureFile_V112.xml"
```
Would give the following output (snippet):

Expand All @@ -143,7 +143,7 @@ Would give the following output (snippet):

You can also specify --binary signature syntax or use --container syntax (the default). This also works for container files, where you get a little more metadata:
```
sigtool --expression --file "container-signature-20221102.xml"
sigtool --expression --file "container-signature-20230510.xml"
```
Gives the following output (snippet):

Expand Down
4 changes: 2 additions & 2 deletions droid-command-line/src/main/resources/options.properties
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ droid -Pr "profile.maxBytesToScan=32768" -a "C:\\Files\\A Folder" -p "C:\\Result
Properties which can be overridden are those prefixed by "profile" in the droid.properties file contained in the droid home folder, \
normally found in the .droid6 home folder under the user's home folder. These currently include the following properties:\n \
profile.defaultThrottle = 0 \n \
profile.defaultBinarySigFileVersion = DROID_SignatureFile_V109 \n \
profile.defaultContainerSigFileVersion = container-signature-20221102 \n \
profile.defaultBinarySigFileVersion = DROID_SignatureFile_V112 \n \
profile.defaultContainerSigFileVersion = container-signature-20230510 \n \
profile.processTar = true \n \
profile.processZip = true \n \
profile.processGzip = true \n \
Expand Down
Loading

0 comments on commit d6d279e

Please sign in to comment.