fix: use my own flag strings

blacktop · Jul 10, 2020 · 2effb60 · 2effb60
1 parent 2663a70
commit 2effb60
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 168 deletions.
diff --git a/types/codesign.go b/types/codesign.go
@@ -1,7 +1,5 @@
 package types
 
-//go:generate stringer -type=CsCodeDirectoryFlag,CDVersion,ExecSegFlag -output codesign_string.go
-
 type CsMagic uint32
 
 const (
@@ -109,9 +107,9 @@ var csSlotTypeStrings = []intName{
 	{uint32(CSSLOT_RESOURCEDIR), "ResourceDir"},
 	{uint32(CSSLOT_APPLICATION), "Application"},
 	{uint32(CSSLOT_ENTITLEMENTS), "Entitlements"},
-	{uint32(CSSLOT_ALTERNATE_CODEDIRECTORIES), "AlternateCodeDirectories"},
-	{uint32(CSSLOT_ALTERNATE_CODEDIRECTORY_MAX), "AlternateCodeDirectoryMax"},
-	{uint32(CSSLOT_ALTERNATE_CODEDIRECTORY_LIMIT), "AlternateCodeDirectoryLimit"},
+	{uint32(CSSLOT_ALTERNATE_CODEDIRECTORIES), "Alternate CodeDirectories"},
+	{uint32(CSSLOT_ALTERNATE_CODEDIRECTORY_MAX), "Alternate CodeDirectory Max"},
+	{uint32(CSSLOT_ALTERNATE_CODEDIRECTORY_LIMIT), "Alternate CodeDirectory Limit"},
 	{uint32(CSSLOT_CMS_SIGNATURE), "CMS (RFC3852) signature"},
 	{uint32(CSSLOT_IDENTIFICATIONSLOT), "IdentificationSlot"},
 	{uint32(CSSLOT_TICKETSLOT), "TicketSlot"},
@@ -175,10 +173,27 @@ const (
 	CS_SUPPORTS_LINKAGE     CDVersion = 0x20600
 )
 
+var csVersionypeStrings = []intName{
+	{uint32(CS_SUPPORTS_SCATTER), "Scatter"},
+	{uint32(CS_SUPPORTS_TEAMID), "TeamID"},
+	{uint32(CS_SUPPORTS_CODELIMIT64), "Codelimit64"},
+	{uint32(CS_SUPPORTS_EXECSEG), "ExecSeg"},
+	{uint32(CS_SUPPORTS_RUNTIME), "Runtime"},
+	{uint32(CS_SUPPORTS_LINKAGE), "Linkage"},
+}
+
+func (v CDVersion) String() string {
+	return stringName(uint32(v), csVersionypeStrings, false)
+}
+func (v CDVersion) GoString() string {
+	return stringName(uint32(v), csVersionypeStrings, true)
+}
+
 type CsCodeDirectoryFlag uint32
 
 const (
 	/* code signing attributes of a process */
+	CS_NONE           CsCodeDirectoryFlag = 0x00000000 /* no flags */
 	CS_VALID          CsCodeDirectoryFlag = 0x00000001 /* dynamically valid */
 	CS_ADHOC          CsCodeDirectoryFlag = 0x00000002 /* ad hoc signed */
 	CS_GET_TASK_ALLOW CsCodeDirectoryFlag = 0x00000004 /* has get-task-allow entitlement */
@@ -219,6 +234,46 @@ const (
 	CS_ENTITLEMENT_FLAGS CsCodeDirectoryFlag = (CS_GET_TASK_ALLOW | CS_INSTALLER | CS_DATAVAULT_CONTROLLER | CS_NVRAM_UNRESTRICTED)
 )
 
+var cdFlagStrings = []intName{
+	{uint32(CS_NONE), "None"},
+	{uint32(CS_VALID), "Valid"},
+	{uint32(CS_ADHOC), "Adhoc"},
+	{uint32(CS_GET_TASK_ALLOW), "GetTaskAllow"},
+	{uint32(CS_INSTALLER), "Installer"},
+	{uint32(CS_FORCED_LV), "ForcedLv"},
+	{uint32(CS_INVALID_ALLOWED), "InvalidAllowed"},
+	{uint32(CS_HARD), "Hard"},
+	{uint32(CS_KILL), "Kill"},
+	{uint32(CS_CHECK_EXPIRATION), "CheckExpiration"},
+	{uint32(CS_RESTRICT), "Restrict"},
+	{uint32(CS_ENFORCEMENT), "Enforcement"},
+	{uint32(CS_REQUIRE_LV), "RequireLv"},
+	{uint32(CS_ENTITLEMENTS_VALIDATED), "EntitlementsValidated"},
+	{uint32(CS_NVRAM_UNRESTRICTED), "NvramUnrestricted"},
+	{uint32(CS_RUNTIME), "Runtime"},
+	{uint32(CS_ALLOWED_MACHO), "AllowedMacho"},
+	{uint32(CS_EXEC_SET_HARD), "ExecSetHard"},
+	{uint32(CS_EXEC_SET_KILL), "ExecSetKill"},
+	{uint32(CS_EXEC_SET_ENFORCEMENT), "ExecSetEnforcement"},
+	{uint32(CS_EXEC_INHERIT_SIP), "ExecInheritSip"},
+	{uint32(CS_KILLED), "Killed"},
+	{uint32(CS_DYLD_PLATFORM), "DyldPlatform"},
+	{uint32(CS_PLATFORM_BINARY), "PlatformBinary"},
+	{uint32(CS_PLATFORM_PATH), "PlatformPath"},
+	{uint32(CS_DEBUGGED), "Debugged"},
+	{uint32(CS_SIGNED), "Signed"},
+	{uint32(CS_DEV_CODE), "DevCode"},
+	{uint32(CS_DATAVAULT_CONTROLLER), "DatavaultController"},
+	{uint32(CS_ENTITLEMENT_FLAGS), "EntitlementFlags"},
+}
+
+func (f CsCodeDirectoryFlag) String() string {
+	return stringName(uint32(f), cdFlagStrings, false)
+}
+func (f CsCodeDirectoryFlag) GoString() string {
+	return stringName(uint32(f), cdFlagStrings, true)
+}
+
 // C form of a CodeDirectory.
 type CsCodeDirectory struct {
 	Magic         CsMagic             // magic number (CSMAGIC_CODEDIRECTORY) */
@@ -273,6 +328,23 @@ const (
 	CS_EXECSEG_CAN_EXEC_CDHASH ExecSegFlag = 0x200 /* can execute blessed cdhash */
 )
 
+var csExecSegFlagStrings = []int64Name{
+	{uint64(CS_EXECSEG_MAIN_BINARY), "Main Binary"},
+	{uint64(CS_EXECSEG_ALLOW_UNSIGNED), "Allow Unsigned"},
+	{uint64(CS_EXECSEG_DEBUGGER), "Debugger"},
+	{uint64(CS_EXECSEG_JIT), "JIT"},
+	{uint64(CS_EXECSEG_SKIP_LV), "Skip LV"},
+	{uint64(CS_EXECSEG_CAN_LOAD_CDHASH), "Can Load Cdhash"},
+	{uint64(CS_EXECSEG_CAN_EXEC_CDHASH), "Can Exec Cdhash"},
+}
+
+func (f ExecSegFlag) String() string {
+	return stringName64(uint64(f), csExecSegFlagStrings, false)
+}
+func (f ExecSegFlag) GoString() string {
+	return stringName64(uint64(f), csExecSegFlagStrings, true)
+}
+
 /* Version 0x20400 */
 type CsCodeDirExecSeg struct {
 	ExecSegBase    uint64      /* offset of executable segment */

diff --git a/types/codesign_string.go b/types/codesign_string.go
diff --git a/types/types.go b/types/types.go
@@ -120,6 +120,11 @@ type intName struct {
 	s string
 }
 
+type int64Name struct {
+	i uint64
+	s string
+}
+
 func stringName(i uint32, names []intName, goSyntax bool) string {
 	for _, n := range names {
 		if n.i == i {
@@ -132,6 +137,18 @@ func stringName(i uint32, names []intName, goSyntax bool) string {
 	return "0x" + strconv.FormatUint(uint64(i), 16)
 }
 
+func stringName64(i uint64, names []int64Name, goSyntax bool) string {
+	for _, n := range names {
+		if n.i == i {
+			if goSyntax {
+				return "macho." + n.s
+			}
+			return n.s
+		}
+	}
+	return "0x" + strconv.FormatUint(uint64(i), 16)
+}
+
 var lsb64Mtable = [65]uint64{
 	0x0000000000000000, 0x0000000000000001, 0x0000000000000003,
 	0x0000000000000007, 0x000000000000000f, 0x000000000000001f,