mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 12:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

include the error code in the string for CRYPTO_ERRORs

Browse source
This commit is contained in:
Marten Seemann 2020-09-25 20:12:25 +07:00
parent 7999b7699a
commit 77f7476bf7
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
integrationtests/self/handshake_test.go
View file

@ -215,7 +215,7 @@ var _ = Describe("Handshake tests", func() {
getTLSClientConfig(), getTLSClientConfig(),
clientConfig, clientConfig,
) )
Expect(err).To(MatchError("CRYPTO_ERROR: x509: cannot validate certificate for 127.0.0.1 because it doesn't contain any IP SANs")) Expect(err).To(MatchError("CRYPTO_ERROR (0x12a): x509: cannot validate certificate for 127.0.0.1 because it doesn't contain any IP SANs"))
}) })
It("fails the handshake if the client fails to provide the requested client cert", func() { It("fails the handshake if the client fails to provide the requested client cert", func() {
@ -240,7 +240,7 @@ var _ = Describe("Handshake tests", func() {
}() }()
Eventually(errChan).Should(Receive(&err)) Eventually(errChan).Should(Receive(&err))
} }
Expect(err).To(MatchError("CRYPTO_ERROR: tls: bad certificate")) Expect(err).To(MatchError("CRYPTO_ERROR (0x12a): tls: bad certificate"))
}) })
It("uses the ServerName in the tls.Config", func() { It("uses the ServerName in the tls.Config", func() {

2
internal/handshake/crypto_setup_test.go
View file

@ -105,7 +105,7 @@ var _ = Describe("Crypto Setup TLS", func() {
go func() { go func() {
defer GinkgoRecover() defer GinkgoRecover()
server.RunHandshake() server.RunHandshake()
Expect(sErrChan).To(Receive(MatchError("CRYPTO_ERROR: local error: tls: unexpected message"))) Expect(sErrChan).To(Receive(MatchError("CRYPTO_ERROR (0x10a): local error: tls: unexpected message")))
close(done) close(done)
}() }()

2
internal/qerr/error_codes.go
View file

@ -85,7 +85,7 @@ func (e ErrorCode) String() string {
return "AEAD_LIMIT_REACHED" return "AEAD_LIMIT_REACHED"
default: default:
if e.isCryptoError() { if e.isCryptoError() {
return "CRYPTO_ERROR" return fmt.Sprintf("CRYPTO_ERROR (%#x)", uint16(e))
} }
return fmt.Sprintf("unknown error code: %#x", uint16(e)) return fmt.Sprintf("unknown error code: %#x", uint16(e))
} }

12
internal/qerr/quic_error_test.go
View file

@ -38,13 +38,13 @@ var _ = Describe("QUIC Transport Errors", func() {
Context("crypto errors", func() { Context("crypto errors", func() {
It("has a string representation for errors with a message", func() { It("has a string representation for errors with a message", func() {
err := NewCryptoError(42, "foobar") err := NewCryptoError(0x42, "foobar")
Expect(err.Error()).To(Equal("CRYPTO_ERROR: foobar")) Expect(err.Error()).To(Equal("CRYPTO_ERROR (0x142): foobar"))
}) })
It("has a string representation for errors without a message", func() { It("has a string representation for errors without a message", func() {
err := NewCryptoError(42, "") err := NewCryptoError(0x2a, "")
Expect(err.Error()).To(Equal("CRYPTO_ERROR: tls: bad certificate")) Expect(err.Error()).To(Equal("CRYPTO_ERROR (0x12a): tls: bad certificate"))
}) })
It("says if an error is a crypto error", func() { It("says if an error is a crypto error", func() {
@ -76,8 +76,8 @@ var _ = Describe("QUIC Transport Errors", func() {
}) })
It("recognizes crypto errors", func() { It("recognizes crypto errors", func() {
err := ErrorCode(0x100 + 42) err := ErrorCode(0x100 + 0x2a)
Expect(err.Error()).To(Equal("CRYPTO_ERROR: tls: bad certificate")) Expect(err.Error()).To(Equal("CRYPTO_ERROR (0x12a): tls: bad certificate"))
}) })
}) })