summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/fipstools/break-hash.go6
-rw-r--r--src/util/fipstools/delocate/delocate.go29
-rw-r--r--src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/in.s3
-rw-r--r--src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/out.s15
-rw-r--r--src/util/generate_build_files.py13
5 files changed, 63 insertions, 3 deletions
diff --git a/src/util/fipstools/break-hash.go b/src/util/fipstools/break-hash.go
index 53e1c5cb..8c817d8d 100644
--- a/src/util/fipstools/break-hash.go
+++ b/src/util/fipstools/break-hash.go
@@ -56,6 +56,10 @@ func do(outPath, inPath string) error {
symbols, err := object.Symbols()
if err != nil {
+ fmt.Fprintf(os.Stderr, "%s\nTrying dynamic symbols\n", err)
+ symbols, err = object.DynamicSymbols()
+ }
+ if err != nil {
return errors.New("failed to parse symbols: " + err.Error())
}
@@ -123,7 +127,7 @@ func do(outPath, inPath string) error {
newHash := mac.Sum(nil)
fmt.Printf("Found start of module at offset 0x%x (VMA 0x%x):\n", start-textSection.Addr, start)
- fmt.Printf(hex.Dump(moduleText[:128]))
+ fmt.Println(hex.Dump(moduleText[:128]))
fmt.Printf("\nHash of module was: %x\n", hashWas)
fmt.Printf("Hash of corrupted module is: %x\n", newHash)
diff --git a/src/util/fipstools/delocate/delocate.go b/src/util/fipstools/delocate/delocate.go
index a43b4286..92b4c31d 100644
--- a/src/util/fipstools/delocate/delocate.go
+++ b/src/util/fipstools/delocate/delocate.go
@@ -803,6 +803,8 @@ const (
instrCombine
// instrThreeArg merges two sources into a destination in some fashion.
instrThreeArg
+ // instrCompare takes two arguments and writes outputs to the flags register.
+ instrCompare
instrOther
)
@@ -833,6 +835,11 @@ func classifyInstruction(instr string, args []*node32) instructionType {
return instrCombine
}
+ case "cmpq":
+ if len(args) == 2 {
+ return instrCompare
+ }
+
case "sarxq", "shlxq", "shrxq":
if len(args) == 3 {
return instrThreeArg
@@ -855,6 +862,13 @@ func push(w stringWriter) wrapperFunc {
}
}
+func compare(w stringWriter, instr, a, b string) wrapperFunc {
+ return func(k func()) {
+ k()
+ w.WriteString(fmt.Sprintf("\t%s %s, %s\n", instr, a, b))
+ }
+}
+
func (d *delocation) loadFromGOT(w stringWriter, destination, symbol, section string, redzoneCleared bool) wrapperFunc {
d.gotExternalsNeeded[symbol+"@"+section] = struct{}{}
@@ -1074,7 +1088,7 @@ Args:
}
classification := classifyInstruction(instructionName, argNodes)
- if classification != instrThreeArg && i != 0 {
+ if classification != instrThreeArg && classification != instrCompare && i != 0 {
return nil, errors.New("GOT access must be source operand")
}
@@ -1091,6 +1105,17 @@ Args:
case instrMove:
assertNodeType(argNodes[1], ruleRegisterOrConstant)
targetReg = d.contents(argNodes[1])
+ case instrCompare:
+ otherSource := d.contents(argNodes[i^1])
+ saveRegWrapper, tempReg := saveRegister(d.output, []string{otherSource})
+ redzoneCleared = true
+ wrappers = append(wrappers, saveRegWrapper)
+ if i == 0 {
+ wrappers = append(wrappers, compare(d.output, instructionName, tempReg, otherSource))
+ } else {
+ wrappers = append(wrappers, compare(d.output, instructionName, otherSource, tempReg))
+ }
+ targetReg = tempReg
case instrTransformingMove:
assertNodeType(argNodes[1], ruleRegisterOrConstant)
targetReg = d.contents(argNodes[1])
@@ -1114,7 +1139,7 @@ Args:
return nil, fmt.Errorf("three-argument instruction has %d arguments", n)
}
if i != 0 && i != 1 {
- return nil, errors.New("GOT access must be from soure operand")
+ return nil, errors.New("GOT access must be from source operand")
}
targetReg = d.contents(argNodes[2])
diff --git a/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/in.s b/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/in.s
index ccbc0bf3..398032f8 100644
--- a/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/in.s
+++ b/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/in.s
@@ -44,4 +44,7 @@ foo:
vpbroadcastq stderr@GOTPCREL(%rip), %xmm0
vpbroadcastq foo@GOTPCREL(%rip), %xmm0
+ cmpq foo@GOTPCREL(%rip), %rax
+ cmpq %rax, foo@GOTPCREL(%rip)
+
.comm foobar,64,32
diff --git a/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/out.s b/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/out.s
index 273cfe94..e14a71e6 100644
--- a/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/out.s
+++ b/src/util/fipstools/delocate/testdata/x86_64-GOTRewrite/out.s
@@ -172,6 +172,21 @@ foo:
leaq 128(%rsp), %rsp
vpbroadcastq %xmm0, %xmm0
+# WAS cmpq foo@GOTPCREL(%rip), %rax
+ leaq -128(%rsp), %rsp
+ pushq %rbx
+ leaq .Lfoo_local_target(%rip), %rbx
+ cmpq %rbx, %rax
+ popq %rbx
+ leaq 128(%rsp), %rsp
+# WAS cmpq %rax, foo@GOTPCREL(%rip)
+ leaq -128(%rsp), %rsp
+ pushq %rbx
+ leaq .Lfoo_local_target(%rip), %rbx
+ cmpq %rax, %rbx
+ popq %rbx
+ leaq 128(%rsp), %rsp
+
.comm foobar,64,32
.text
.loc 1 2 0
diff --git a/src/util/generate_build_files.py b/src/util/generate_build_files.py
index 57e5e1b1..8a5df75d 100644
--- a/src/util/generate_build_files.py
+++ b/src/util/generate_build_files.py
@@ -272,6 +272,8 @@ class Bazel(object):
self.PrintVariableSection(out, 'ssl_test_sources', files['ssl_test'])
self.PrintVariableSection(out, 'crypto_test_data',
files['crypto_test_data'])
+ self.PrintVariableSection(out, 'urandom_test_sources',
+ files['urandom_test'])
class Eureka(object):
@@ -685,6 +687,12 @@ def main(platforms):
'src/crypto/test/file_test_gtest.cc',
'src/crypto/test/gtest_main.cc',
]
+ # urandom_test.cc is in a separate binary so that it can be test PRNG
+ # initialisation.
+ crypto_test_files = [
+ file for file in crypto_test_files
+ if not file.endswith('/urandom_test.cc')
+ ]
ssl_test_files = FindCFiles(os.path.join('src', 'ssl'), OnlyTests)
ssl_test_files += [
@@ -692,6 +700,10 @@ def main(platforms):
'src/crypto/test/gtest_main.cc',
]
+ urandom_test_files = [
+ 'src/crypto/fipsmodule/rand/urandom_test.cc',
+ ]
+
fuzz_c_files = FindCFiles(os.path.join('src', 'fuzz'), NoTests)
ssl_h_files = (
@@ -729,6 +741,7 @@ def main(platforms):
'tool_headers': tool_h_files,
'test_support': test_support_c_files,
'test_support_headers': test_support_h_files,
+ 'urandom_test': sorted(urandom_test_files),
}
asm_outputs = sorted(WriteAsmFiles(ReadPerlAsmOperations()).iteritems())
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 02:33:08 +0000