Update TLS fuzzer format with prepended settings.
This allows us to fill in holes in our fuzzer coverage, notably client
resumption (and thus early data) and server client certificates. The
corpora are not refreshed yet. This will be done in upcoming changes.
Also add an option for debugging fuzzers. It's very useful to test it on
transcripts and make sure that fuzzer mode successfully makes things
compatible.
Bug: 104
Change-Id: I02f0be4045d1baf68efc9a4157f573df1429575d
Reviewed-on: https://boringssl-review.googlesource.com/17531
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
index 7ba0c08..17c4f4f 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -465,30 +465,20 @@
var testCases []testCase
-func writeTranscript(test *testCase, num int, data []byte) {
+func writeTranscript(test *testCase, path string, data []byte) {
if len(data) == 0 {
return
}
- protocol := "tls"
- if test.protocol == dtls {
- protocol = "dtls"
- }
-
- side := "client"
- if test.testType == serverTest {
- side = "server"
- }
-
- dir := path.Join(*transcriptDir, protocol, side)
- if err := os.MkdirAll(dir, 0755); err != nil {
- fmt.Fprintf(os.Stderr, "Error making %s: %s\n", dir, err)
+ settings, err := ioutil.ReadFile(path)
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "Error reading %s: %s.\n", path, err)
return
}
- name := fmt.Sprintf("%s-%d", test.name, num)
- if err := ioutil.WriteFile(path.Join(dir, name), data, 0644); err != nil {
- fmt.Fprintf(os.Stderr, "Error writing %s: %s\n", name, err)
+ settings = append(settings, data...)
+ if err := ioutil.WriteFile(path, settings, 0644); err != nil {
+ fmt.Fprintf(os.Stderr, "Error writing %s: %s\n", path, err)
}
}
@@ -512,7 +502,7 @@
return t.Conn.Write(b)
}
-func doExchange(test *testCase, config *Config, conn net.Conn, isResume bool, num int) error {
+func doExchange(test *testCase, config *Config, conn net.Conn, isResume bool, transcriptPrefix string, num int) error {
if !test.noSessionCache {
if config.ClientSessionCache == nil {
config.ClientSessionCache = NewLRUClientSessionCache(1)
@@ -561,9 +551,10 @@
if *flagDebug {
defer connDebug.WriteTo(os.Stdout)
}
- if len(*transcriptDir) != 0 {
+ if len(transcriptPrefix) != 0 {
defer func() {
- writeTranscript(test, num, connDebug.Transcript())
+ path := transcriptPrefix + strconv.Itoa(num)
+ writeTranscript(test, path, connDebug.Transcript())
}()
}
@@ -1025,6 +1016,26 @@
flags = append(flags, "-tls-unique")
}
+ var transcriptPrefix string
+ if len(*transcriptDir) != 0 {
+ protocol := "tls"
+ if test.protocol == dtls {
+ protocol = "dtls"
+ }
+
+ side := "client"
+ if test.testType == serverTest {
+ side = "server"
+ }
+
+ dir := filepath.Join(*transcriptDir, protocol, side)
+ if err := os.MkdirAll(dir, 0755); err != nil {
+ return err
+ }
+ transcriptPrefix = filepath.Join(dir, test.name+"-")
+ flags = append(flags, "-write-settings", transcriptPrefix)
+ }
+
flags = append(flags, test.flags...)
var shim *exec.Cmd
@@ -1064,7 +1075,7 @@
conn, err := acceptOrWait(listener, waitChan)
if err == nil {
- err = doExchange(test, &config, conn, false /* not a resumption */, 0)
+ err = doExchange(test, &config, conn, false /* not a resumption */, transcriptPrefix, 0)
conn.Close()
}
@@ -1084,7 +1095,7 @@
var connResume net.Conn
connResume, err = acceptOrWait(listener, waitChan)
if err == nil {
- err = doExchange(test, &resumeConfig, connResume, true /* resumption */, i+1)
+ err = doExchange(test, &resumeConfig, connResume, true /* resumption */, transcriptPrefix, i+1)
connResume.Close()
}
}