mirror of
https://github.com/XTLS/REALITY.git
synced 2025-08-22 22:48:36 +00:00
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>
This commit is contained in:
parent
109710f63d
commit
b54592c7d6
@ -909,10 +909,7 @@ func (hs *clientHandshakeState) saveSessionTicket() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
session, err := c.sessionState()
|
session := c.sessionState()
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
session.secret = hs.masterSecret
|
session.secret = hs.masterSecret
|
||||||
|
|
||||||
cs := &ClientSessionState{ticket: hs.ticket, session: session}
|
cs := &ClientSessionState{ticket: hs.ticket, session: session}
|
||||||
|
@ -753,11 +753,7 @@ func (c *Conn) handleNewSessionTicket(msg *newSessionTicketMsgTLS13) error {
|
|||||||
psk := cipherSuite.expandLabel(c.resumptionSecret, "resumption",
|
psk := cipherSuite.expandLabel(c.resumptionSecret, "resumption",
|
||||||
msg.nonce, cipherSuite.hash.Size())
|
msg.nonce, cipherSuite.hash.Size())
|
||||||
|
|
||||||
session, err := c.sessionState()
|
session := c.sessionState()
|
||||||
if err != nil {
|
|
||||||
c.sendAlert(alertInternalError)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
session.secret = psk
|
session.secret = psk
|
||||||
session.useBy = uint64(c.config.time().Add(lifetime).Unix())
|
session.useBy = uint64(c.config.time().Add(lifetime).Unix())
|
||||||
session.ageAdd = msg.ageAdd
|
session.ageAdd = msg.ageAdd
|
||||||
|
@ -802,10 +802,7 @@ func (hs *serverHandshakeState) sendSessionTicket() error {
|
|||||||
c := hs.c
|
c := hs.c
|
||||||
m := new(newSessionTicketMsg)
|
m := new(newSessionTicketMsg)
|
||||||
|
|
||||||
state, err := c.sessionState()
|
state := c.sessionState()
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
state.secret = hs.masterSecret
|
state.secret = hs.masterSecret
|
||||||
if hs.sessionState != nil {
|
if hs.sessionState != nil {
|
||||||
// If this is re-wrapping an old key, then keep
|
// If this is re-wrapping an old key, then keep
|
||||||
@ -813,6 +810,7 @@ func (hs *serverHandshakeState) sendSessionTicket() error {
|
|||||||
state.createdAt = hs.sessionState.createdAt
|
state.createdAt = hs.sessionState.createdAt
|
||||||
}
|
}
|
||||||
if c.config.WrapSession != nil {
|
if c.config.WrapSession != nil {
|
||||||
|
var err error
|
||||||
m.ticket, err = c.config.WrapSession(c.connectionStateLocked(), state)
|
m.ticket, err = c.config.WrapSession(c.connectionStateLocked(), state)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -889,13 +889,11 @@ func (c *Conn) sendSessionTicket(earlyData bool) error {
|
|||||||
|
|
||||||
m := new(newSessionTicketMsgTLS13)
|
m := new(newSessionTicketMsgTLS13)
|
||||||
|
|
||||||
state, err := c.sessionState()
|
state := c.sessionState()
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
state.secret = psk
|
state.secret = psk
|
||||||
state.EarlyData = earlyData
|
state.EarlyData = earlyData
|
||||||
if c.config.WrapSession != nil {
|
if c.config.WrapSession != nil {
|
||||||
|
var err error
|
||||||
m.label, err = c.config.WrapSession(c.connectionStateLocked(), state)
|
m.label, err = c.config.WrapSession(c.connectionStateLocked(), state)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -917,8 +915,7 @@ func (c *Conn) sendSessionTicket(earlyData bool) error {
|
|||||||
// The value is not stored anywhere; we never need to check the ticket age
|
// The value is not stored anywhere; we never need to check the ticket age
|
||||||
// because 0-RTT is not supported.
|
// because 0-RTT is not supported.
|
||||||
ageAdd := make([]byte, 4)
|
ageAdd := make([]byte, 4)
|
||||||
_, err = c.config.rand().Read(ageAdd)
|
if _, err := c.config.rand().Read(ageAdd); err != nil {
|
||||||
if err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
m.ageAdd = binary.LittleEndian.Uint32(ageAdd)
|
m.ageAdd = binary.LittleEndian.Uint32(ageAdd)
|
||||||
|
@ -289,7 +289,7 @@ func ParseSessionState(data []byte) (*SessionState, error) {
|
|||||||
|
|
||||||
// sessionState returns a partially filled-out [SessionState] with information
|
// sessionState returns a partially filled-out [SessionState] with information
|
||||||
// from the current connection.
|
// from the current connection.
|
||||||
func (c *Conn) sessionState() (*SessionState, error) {
|
func (c *Conn) sessionState() *SessionState {
|
||||||
return &SessionState{
|
return &SessionState{
|
||||||
version: c.vers,
|
version: c.vers,
|
||||||
cipherSuite: c.cipherSuite,
|
cipherSuite: c.cipherSuite,
|
||||||
@ -302,7 +302,7 @@ func (c *Conn) sessionState() (*SessionState, error) {
|
|||||||
isClient: c.isClient,
|
isClient: c.isClient,
|
||||||
extMasterSecret: c.extMasterSecret,
|
extMasterSecret: c.extMasterSecret,
|
||||||
verifiedChains: c.verifiedChains,
|
verifiedChains: c.verifiedChains,
|
||||||
}, nil
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// EncryptTicket encrypts a ticket with the [Config]'s configured (or default)
|
// EncryptTicket encrypts a ticket with the [Config]'s configured (or default)
|
||||||
|
Loading…
Reference in New Issue
Block a user