Remove remnants of end_of_early_data alert from tests. It changed from an alert to a handshake message in the standardization process. Change-Id: Ib3e5b29ccf83b72d78a714f604957ca55594d5e3 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/38604 Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/test/runner/alert.go b/ssl/test/runner/alert.go index c79725e..c1f7f27 100644 --- a/ssl/test/runner/alert.go +++ b/ssl/test/runner/alert.go
@@ -16,7 +16,6 @@ const ( alertCloseNotify alert = 0 - alertEndOfEarlyData alert = 1 alertUnexpectedMessage alert = 10 alertBadRecordMAC alert = 20 alertDecryptionFailed alert = 21 @@ -50,7 +49,6 @@ var alertText = map[alert]string{ alertCloseNotify: "close notify", - alertEndOfEarlyData: "end of early data", alertUnexpectedMessage: "unexpected message", alertBadRecordMAC: "bad record MAC", alertDecryptionFailed: "decryption failed",
diff --git a/ssl/test/runner/conn.go b/ssl/test/runner/conn.go index 8a3ed5d..1d04541 100644 --- a/ssl/test/runner/conn.go +++ b/ssl/test/runner/conn.go
@@ -22,7 +22,6 @@ ) var errNoCertificateAlert = errors.New("tls: no certificate alert") -var errEndOfEarlyDataAlert = errors.New("tls: end of early data alert") // A Conn represents a secured connection. // It implements the net.Conn interface. @@ -1008,10 +1007,6 @@ c.in.freeBlock(b) return errNoCertificateAlert } - if alert(data[1]) == alertEndOfEarlyData { - c.in.freeBlock(b) - return errEndOfEarlyDataAlert - } // drop on the floor c.in.freeBlock(b) @@ -1087,7 +1082,7 @@ // L < c.out.Mutex. func (c *Conn) sendAlert(err alert) error { level := byte(alertLevelError) - if err == alertNoRenegotiation || err == alertCloseNotify || err == alertNoCertificate || err == alertEndOfEarlyData { + if err == alertNoRenegotiation || err == alertCloseNotify || err == alertNoCertificate { level = alertLevelWarning } return c.SendAlert(level, err)