Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 23:17:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source 
Conflicts:
	Ghidra/application.properties
This commit is contained in:
Ryan Kurtz
2023-06-15 16:16:10 -04:00
parent 2a97771c0f a6253b1f7f
commit 6835217aa2
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/external/ExternalDebugInfo.java
Vendored
+1 -1
View File
@@ -45,7 +45,7 @@ public class ExternalDebugInfo {
String filename = debugLink != null ? debugLink.getFilename() : null; String filename = debugLink != null ? debugLink.getFilename() : null;
int crc = debugLink != null ? debugLink.getCrc() : 0; int crc = debugLink != null ? debugLink.getCrc() : 0;
byte[] hash = buildId != null ? buildId.getHash() : null; byte[] hash = buildId != null ? buildId.getDescription() : null;
return new ExternalDebugInfo(filename, crc, hash); return new ExternalDebugInfo(filename, crc, hash);
} }
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/NoteGnuBuildId.java
+5 -9
View File
@@ -23,12 +23,12 @@ import ghidra.program.model.data.*;
import ghidra.program.model.listing.Program; import ghidra.program.model.listing.Program;
/** /**
* An ELF note that specifies the build-id hash of the containing program. * An ELF note that specifies the build-id (sha1/md5/etc hash or manually specified bytes that
* can be hex-ified) of the containing program.
* <p> * <p>
* The build-id hash is useful to find an external debug file. * The hex values of the build-id are useful to find an external debug file.
*/ */
public class NoteGnuBuildId extends ElfNote { public class NoteGnuBuildId extends ElfNote {
private static final int SHA1_DESC_LEN = 20; // 160bit SHA1 == 20 bytes
public static final String SECTION_NAME = ".note.gnu.build-id"; public static final String SECTION_NAME = ".note.gnu.build-id";
/** /**
@@ -40,7 +40,7 @@ public class NoteGnuBuildId extends ElfNote {
* @throws IOException if data error * @throws IOException if data error
*/ */
public static NoteGnuBuildId read(ElfNote note, Program program) throws IOException { public static NoteGnuBuildId read(ElfNote note, Program program) throws IOException {
if (!note.isGnu() || note.getDescription().length != SHA1_DESC_LEN) { if (!note.isGnu() || note.getDescription().length == 0) {
throw new IOException("Invalid .note.gnu.build-id values: %s, %d" throw new IOException("Invalid .note.gnu.build-id values: %s, %d"
.formatted(note.getName(), note.getDescription().length)); .formatted(note.getName(), note.getDescription().length));
} }
@@ -63,10 +63,6 @@ public class NoteGnuBuildId extends ElfNote {
super(nameLen, name, vendorType, description); super(nameLen, name, vendorType, description);
} }
public byte[] getHash() {
return getDescription();
}
@Override @Override
public String getNoteTypeName() { public String getNoteTypeName() {
return "GNU BuildId"; return "GNU BuildId";
@@ -76,7 +72,7 @@ public class NoteGnuBuildId extends ElfNote {
public StructureDataType toStructure(DataTypeManager dtm) { public StructureDataType toStructure(DataTypeManager dtm) {
StructureDataType result = StructureDataType result =
createNoteStructure(null, "GnuBuildId", false, getNameLen(), 0, dtm); createNoteStructure(null, "GnuBuildId", false, getNameLen(), 0, dtm);
result.add(new ArrayDataType(BYTE, getDescriptionLen(), -1, dtm), "hash", "SHA1"); result.add(new ArrayDataType(BYTE, getDescriptionLen(), -1, dtm), "hash", null);
return result; return result;
} }