mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-19 19:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove predefined sig to add to another pull request

Browse Source
This commit is contained in:
momo 2015-10-27 14:34:14 -04:00
parent 98e43b7666
commit 14c91eb2df
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
View File

@ -635,12 +635,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
*/ */
long offset; long offset;
try { try {
if(isFooterCheckBox.isSelected()) { offset = isFooterCheckBox.isSelected() ? -1 : Long.parseUnsignedLong(offsetTextField.getText());
offset = -1;
}
else {
offset = Long.parseUnsignedLong(offsetTextField.getText());
}
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.message"), NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.message"),

8
Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypes.xsd
View File

@ -22,10 +22,16 @@
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="nonNegativeMinus1">
<xs:restriction base="xs:integer">
<xs:minInclusive value="-1"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="signatureType"> <xs:complexType name="signatureType">
<xs:sequence> <xs:sequence>
<xs:element name="Bytes" type="stringType"/> <xs:element name="Bytes" type="stringType"/>
<xs:element name="Offset" type="xs:nonNegativeInteger"/> <xs:element name="Offset" type="nonNegativeMinus1"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="type" type="sigInterpretationType" use="required"/> <xs:attribute name="type" type="sigInterpretationType" use="required"/>
</xs:complexType> </xs:complexType>

6
Core/src/org/sleuthkit/autopsy/modules/filetypeid/UserDefinedFileTypesManager.java
View File

@ -224,12 +224,6 @@ final class UserDefinedFileTypesManager {
// Add rule for .pfm // Add rule for .pfm
fileType = new FileType("image/x-portable-floatmap", new Signature("PF", 0L), "", false); //NON-NLS fileType = new FileType("image/x-portable-floatmap", new Signature("PF", 0L), "", false); //NON-NLS
fileTypes.put(fileType.getMimeType(), fileType); fileTypes.put(fileType.getMimeType(), fileType);
// Add rule for .tga
byteArray = DatatypeConverter.parseHexBinary("54525545564953494F4E2D5846494C452E00");
fileType = new FileType("image/x-tga", new Signature(byteArray, true), "", false); // NON-NLS
fileTypes.put(fileType.getMimeType(), fileType);
} }
// parseHexBinary() throws this if the argument passed in is not Hex // parseHexBinary() throws this if the argument passed in is not Hex
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {