crypto/tls,regexp: remove always-nil error results

These were harmless, but added unnecessary verbosity to the code.
This can happen as a result of refactors: for example,
the method sessionState used to return errors in some cases.

Change-Id: I4e6dacc01ae6a49b528c672979f95cbb86795a85
Reviewed-on: https://go-review.googlesource.com/c/go/+/528995
Reviewed-by: Leo Isla <islaleo93@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Olivier Mengué <olivier.mengue@gmail.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: qiulaidongfeng <2645477756@qq.com>
Reviewed-by: Quim Muntal <quimmuntal@gmail.com>

diff --git a/src/crypto/tls/handshake_client.go b/src/crypto/tls/handshake_client.go
index f016e01b4b5182dccff5944b70ef431983c63f25..0b35deefa145e6ab411b4eef5d551a2fb973dc08 100644 (file)
--- a/src/crypto/tls/handshake_client.go
+++ b/src/crypto/tls/handshake_client.go
@@ -915,10 +915,7 @@ func (hs *clientHandshakeState) saveSessionTicket() error {
                return nil
        }
 
-       session, err := c.sessionState()
-       if err != nil {
-               return err
-       }
+       session := c.sessionState()
        session.secret = hs.masterSecret
 
        cs := &ClientSessionState{ticket: hs.ticket, session: session}

diff --git a/src/crypto/tls/handshake_client_tls13.go b/src/crypto/tls/handshake_client_tls13.go
index 2f59f6888c5d81949040946958f88c37ab942c1a..a0fc413f8ff4f1546494676d8b846e510f86dbda 100644 (file)
--- a/src/crypto/tls/handshake_client_tls13.go
+++ b/src/crypto/tls/handshake_client_tls13.go
@@ -753,11 +753,7 @@ func (c *Conn) handleNewSessionTicket(msg *newSessionTicketMsgTLS13) error {
        psk := cipherSuite.expandLabel(c.resumptionSecret, "resumption",
                msg.nonce, cipherSuite.hash.Size())
 
-       session, err := c.sessionState()
-       if err != nil {
-               c.sendAlert(alertInternalError)
-               return err
-       }
+       session := c.sessionState()
        session.secret = psk
        session.useBy = uint64(c.config.time().Add(lifetime).Unix())
        session.ageAdd = msg.ageAdd

diff --git a/src/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go
index 8129e9c6164af9341dc4b0857fb5263b8193dd48..eb87ee038c72d0b1411aac214d34c053b2c61c01 100644 (file)
--- a/src/crypto/tls/handshake_server.go
+++ b/src/crypto/tls/handshake_server.go
@@ -810,10 +810,7 @@ func (hs *serverHandshakeState) sendSessionTicket() error {
        c := hs.c
        m := new(newSessionTicketMsg)
 
-       state, err := c.sessionState()
-       if err != nil {
-               return err
-       }
+       state := c.sessionState()
        state.secret = hs.masterSecret
        if hs.sessionState != nil {
                // If this is re-wrapping an old key, then keep
@@ -821,6 +818,7 @@ func (hs *serverHandshakeState) sendSessionTicket() error {
                state.createdAt = hs.sessionState.createdAt
        }
        if c.config.WrapSession != nil {
+               var err error
                m.ticket, err = c.config.WrapSession(c.connectionStateLocked(), state)
                if err != nil {
                        return err

diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go
index 21d798de37db0ab5a351968efa427d5e565a523c..60a3883023c028883f81375fd729c944523bf171 100644 (file)
--- a/src/crypto/tls/handshake_server_tls13.go
+++ b/src/crypto/tls/handshake_server_tls13.go
@@ -837,13 +837,11 @@ func (c *Conn) sendSessionTicket(earlyData bool) error {
 
        m := new(newSessionTicketMsgTLS13)
 
-       state, err := c.sessionState()
-       if err != nil {
-               return err
-       }
+       state := c.sessionState()
        state.secret = psk
        state.EarlyData = earlyData
        if c.config.WrapSession != nil {
+               var err error
                m.label, err = c.config.WrapSession(c.connectionStateLocked(), state)
                if err != nil {
                        return err
@@ -865,8 +863,7 @@ func (c *Conn) sendSessionTicket(earlyData bool) error {
        // The value is not stored anywhere; we never need to check the ticket age
        // because 0-RTT is not supported.
        ageAdd := make([]byte, 4)
-       _, err = c.config.rand().Read(ageAdd)
-       if err != nil {
+       if _, err := c.config.rand().Read(ageAdd); err != nil {
                return err
        }
        m.ageAdd = binary.LittleEndian.Uint32(ageAdd)

diff --git a/src/crypto/tls/ticket.go b/src/crypto/tls/ticket.go
index b71e3afdb21116dcda63e387192c26b7fcede257..04e1dd6685d0a4a951bdeb20b180b9da6f34825d 100644 (file)
--- a/src/crypto/tls/ticket.go
+++ b/src/crypto/tls/ticket.go
@@ -289,7 +289,7 @@ func ParseSessionState(data []byte) (*SessionState, error) {
 
 // sessionState returns a partially filled-out [SessionState] with information
 // from the current connection.
-func (c *Conn) sessionState() (*SessionState, error) {
+func (c *Conn) sessionState() *SessionState {
        return &SessionState{
                version:           c.vers,
                cipherSuite:       c.cipherSuite,
@@ -302,7 +302,7 @@ func (c *Conn) sessionState() (*SessionState, error) {
                isClient:          c.isClient,
                extMasterSecret:   c.extMasterSecret,
                verifiedChains:    c.verifiedChains,
-       }, nil
+       }
 }
 
 // EncryptTicket encrypts a ticket with the [Config]'s configured (or default)

diff --git a/src/regexp/syntax/parse.go b/src/regexp/syntax/parse.go
index 6ed6491c807a2fa098bb2088eb73ece41aa19a6e..8f16f6308f2d013207134135a80cabdf4dfbc677 100644 (file)
--- a/src/regexp/syntax/parse.go
+++ b/src/regexp/syntax/parse.go
@@ -941,9 +941,7 @@ func parse(s string, flags Flags) (_ *Regexp, err error) {
                        p.op(opLeftParen).Cap = p.numCap
                        t = t[1:]
                case '|':
-                       if err = p.parseVerticalBar(); err != nil {
-                               return nil, err
-                       }
+                       p.parseVerticalBar()
                        t = t[1:]
                case ')':
                        if err = p.parseRightParen(); err != nil {
@@ -1328,7 +1326,7 @@ func matchRune(re *Regexp, r rune) bool {
 }
 
 // parseVerticalBar handles a | in the input.
-func (p *parser) parseVerticalBar() error {
+func (p *parser) parseVerticalBar() {
        p.concat()
 
        // The concatenation we just parsed is on top of the stack.
@@ -1338,8 +1336,6 @@ func (p *parser) parseVerticalBar() error {
        if !p.swapVerticalBar() {
                p.op(opVerticalBar)
        }
-
-       return nil
 }
 
 // mergeCharClass makes dst = dst|src.