drop Go 1.22 and require Go 1.23.0 or later (#876)
This lets us start taking advantage of featurs from Go 1.23, particularly tracking aliases in go/types and iterators. Note that we need to add code to properly handle or skip over the new *types.Alias type which go/types produces for Go type aliases. Also note that we actually turn this mode off entirely for now, due to the bug reported at https://go.dev/issue/70394. We don't yet remove our own alias tracking code yet due to the above. We hope to be able to remove it very soon.pull/885/head
Daniel Martí
5 months ago
committed by
GitHub
parent
69d7b84f35
commit
30357af923
@ -1,20 +1,20 @@
|
||||
module mvdan.cc/garble
|
||||
|
||||
go 1.22
|
||||
go 1.23
|
||||
|
||||
require (
|
||||
github.com/bluekeyes/go-gitdiff v0.7.1
|
||||
github.com/bluekeyes/go-gitdiff v0.8.0
|
||||
github.com/go-quicktest/qt v1.101.0
|
||||
github.com/google/go-cmp v0.6.0
|
||||
github.com/rogpeppe/go-internal v1.12.0
|
||||
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
|
||||
golang.org/x/mod v0.20.0
|
||||
golang.org/x/tools v0.24.0
|
||||
github.com/rogpeppe/go-internal v1.13.1
|
||||
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
|
||||
golang.org/x/mod v0.21.0
|
||||
golang.org/x/tools v0.26.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/kr/pretty v0.3.1 // indirect
|
||||
github.com/kr/text v0.2.0 // indirect
|
||||
golang.org/x/sync v0.8.0 // indirect
|
||||
golang.org/x/sys v0.23.0 // indirect
|
||||
golang.org/x/sys v0.26.0 // indirect
|
||||
)
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From ef30d58213cf765d0e02eb3b4e151b170fb9fd6b Mon Sep 17 00:00:00 2001
|
||||
From: pagran <pagran@protonmail.com>
|
||||
Date: Mon, 9 Jan 2023 13:30:00 +0100
|
||||
Subject: [PATCH 1/3] add custom magic value
|
||||
|
||||
---
|
||||
cmd/link/internal/ld/pcln.go | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/cmd/link/internal/ld/pcln.go b/cmd/link/internal/ld/pcln.go
|
||||
index 5734b92507..0f95ad928b 100644
|
||||
--- a/cmd/link/internal/ld/pcln.go
|
||||
+++ b/cmd/link/internal/ld/pcln.go
|
||||
@@ -263,6 +263,19 @@ func (state *pclntab) generatePCHeader(ctxt *Link) {
|
||||
if off != size {
|
||||
panic(fmt.Sprintf("pcHeader size: %d != %d", off, size))
|
||||
}
|
||||
+
|
||||
+ // Use garble prefix in variable names to minimize collision risk
|
||||
+ garbleMagicStr := os.Getenv("GARBLE_LINK_MAGIC")
|
||||
+ if garbleMagicStr == "" {
|
||||
+ panic("[garble] magic value must be set")
|
||||
+ }
|
||||
+ var garbleMagicVal uint32
|
||||
+ // Use fmt package instead of strconv to avoid importing a new package
|
||||
+ if _, err := fmt.Sscan(garbleMagicStr, &garbleMagicVal); err != nil {
|
||||
+ panic(fmt.Errorf("[garble] invalid magic value %s: %v", garbleMagicStr, err))
|
||||
+ }
|
||||
+
|
||||
+ header.SetUint32(ctxt.Arch, 0, garbleMagicVal)
|
||||
}
|
||||
|
||||
state.pcheader = state.addGeneratedSym(ctxt, "runtime.pcheader", size, writeHeader)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
From fef657296f1f1b51b73b4e715af4ce9569d05bae Mon Sep 17 00:00:00 2001
|
||||
From: pagran <pagran@protonmail.com>
|
||||
Date: Mon, 9 Jan 2023 13:30:36 +0100
|
||||
Subject: [PATCH 2/3] add unexported function name removing
|
||||
|
||||
---
|
||||
cmd/link/internal/ld/pcln.go | 43 +++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 42 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmd/link/internal/ld/pcln.go b/cmd/link/internal/ld/pcln.go
|
||||
index 0f95ad928b..6bfa03da87 100644
|
||||
--- a/cmd/link/internal/ld/pcln.go
|
||||
+++ b/cmd/link/internal/ld/pcln.go
|
||||
@@ -4,6 +4,10 @@
|
||||
|
||||
package ld
|
||||
|
||||
+import (
|
||||
+ "unicode"
|
||||
+)
|
||||
+
|
||||
import (
|
||||
"cmd/internal/goobj"
|
||||
"cmd/internal/objabi"
|
||||
@@ -315,19 +319,56 @@ func walkFuncs(ctxt *Link, funcs []loader.Sym, f func(loader.Sym)) {
|
||||
func (state *pclntab) generateFuncnametab(ctxt *Link, funcs []loader.Sym) map[loader.Sym]uint32 {
|
||||
nameOffsets := make(map[loader.Sym]uint32, state.nfunc)
|
||||
|
||||
+ garbleTiny := os.Getenv("GARBLE_LINK_TINY") == "true"
|
||||
+
|
||||
// Write the null terminated strings.
|
||||
writeFuncNameTab := func(ctxt *Link, s loader.Sym) {
|
||||
symtab := ctxt.loader.MakeSymbolUpdater(s)
|
||||
+ if garbleTiny {
|
||||
+ symtab.AddStringAt(0, "")
|
||||
+ }
|
||||
+
|
||||
for s, off := range nameOffsets {
|
||||
+ if garbleTiny && off == 0 {
|
||||
+ continue
|
||||
+ }
|
||||
symtab.AddCStringAt(int64(off), ctxt.loader.SymName(s))
|
||||
}
|
||||
}
|
||||
|
||||
// Loop through the CUs, and calculate the size needed.
|
||||
var size int64
|
||||
+
|
||||
+ if garbleTiny {
|
||||
+ size = 1 // first byte is reserved for empty string used for all non-exportable method names
|
||||
+ }
|
||||
+ // Kinds of SymNames found in the wild:
|
||||
+ //
|
||||
+ // * reflect.Value.CanAddr
|
||||
+ // * reflect.(*Value).String
|
||||
+ // * reflect.w6cEoKc
|
||||
+ // * internal/abi.(*RegArgs).IntRegArgAddr
|
||||
+ // * type:.eq.runtime.special
|
||||
+ // * runtime/internal/atomic.(*Pointer[go.shape.string]).Store
|
||||
+ //
|
||||
+ // Checking whether the first rune after the last dot is uppercase seems enough.
|
||||
+ isExported := func(name string) bool {
|
||||
+ for _, r := range name[strings.LastIndexByte(name, '.')+1:] {
|
||||
+ return unicode.IsUpper(r)
|
||||
+ }
|
||||
+ return false
|
||||
+ }
|
||||
+
|
||||
walkFuncs(ctxt, funcs, func(s loader.Sym) {
|
||||
+ name := ctxt.loader.SymName(s)
|
||||
+
|
||||
+ if garbleTiny && !isExported(name) {
|
||||
+ nameOffsets[s] = 0 // redirect name to empty string
|
||||
+ return
|
||||
+ }
|
||||
+
|
||||
nameOffsets[s] = uint32(size)
|
||||
- size += int64(len(ctxt.loader.SymName(s)) + 1) // NULL terminate
|
||||
+ size += int64(len(name) + 1) // NULL terminate
|
||||
})
|
||||
|
||||
state.funcnametab = state.addGeneratedSym(ctxt, "runtime.funcnametab", size, writeFuncNameTab)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From 49f31a321c5b2d082981428abbb5d53e244c4200 Mon Sep 17 00:00:00 2001
|
||||
From: pagran <pagran@protonmail.com>
|
||||
Date: Sat, 14 Jan 2023 21:36:16 +0100
|
||||
Subject: [PATCH 3/3] add entryOff encryption
|
||||
|
||||
---
|
||||
cmd/link/internal/ld/pcln.go | 20 ++++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/cmd/link/internal/ld/pcln.go b/cmd/link/internal/ld/pcln.go
|
||||
index 6bfa03da87..538cba32db 100644
|
||||
--- a/cmd/link/internal/ld/pcln.go
|
||||
+++ b/cmd/link/internal/ld/pcln.go
|
||||
@@ -803,6 +803,26 @@ func writeFuncs(ctxt *Link, sb *loader.SymbolBuilder, funcs []loader.Sym, inlSym
|
||||
sb.SetUint32(ctxt.Arch, dataoff, uint32(ldr.SymValue(fdsym)-gofuncBase))
|
||||
}
|
||||
}
|
||||
+
|
||||
+ // Moving next code higher is not recommended.
|
||||
+ // Only at the end of the current function no edits between go versions
|
||||
+ garbleEntryOffKeyStr := os.Getenv("GARBLE_LINK_ENTRYOFF_KEY")
|
||||
+ if garbleEntryOffKeyStr == "" {
|
||||
+ panic("[garble] entryOff key must be set")
|
||||
+ }
|
||||
+ var garbleEntryOffKey uint32
|
||||
+ // Use fmt package instead of strconv to avoid importing a new package
|
||||
+ if _, err := fmt.Sscan(garbleEntryOffKeyStr, &garbleEntryOffKey); err != nil {
|
||||
+ panic(fmt.Errorf("[garble] invalid entryOff key %s: %v", garbleEntryOffKeyStr, err))
|
||||
+ }
|
||||
+
|
||||
+ garbleData := sb.Data()
|
||||
+ for _, off := range startLocations {
|
||||
+ entryOff := ctxt.Arch.ByteOrder.Uint32(garbleData[off:])
|
||||
+ nameOff := ctxt.Arch.ByteOrder.Uint32(garbleData[off+4:])
|
||||
+
|
||||
+ sb.SetUint32(ctxt.Arch, int64(off), entryOff^(nameOff*garbleEntryOffKey))
|
||||
+ }
|
||||
}
|
||||
|
||||
// pclntab initializes the pclntab symbol with
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Loading…
Reference in New Issue