Subject: [PATCH 1/5] Update tests to match current exception strings for malformed certs. From: David Eger Date: Fri, 3 Sep 2021 14:04:31 -0700 --- crypto/pemutil/pem_test.go | 4 ++-- crypto/x509util/identity_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/pemutil/pem_test.go b/crypto/pemutil/pem_test.go index 30851dcc..3c4249e2 100644 --- a/crypto/pemutil/pem_test.go +++ b/crypto/pemutil/pem_test.go @@ -230,7 +230,7 @@ func TestReadCertificate(t *testing.T) { {"testdata/notexists.crt", errors.New("open testdata/notexists.crt failed: no such file or directory")}, {"testdata/badca.crt", errors.New("error parsing testdata/badca.crt")}, {"testdata/badpem.crt", errors.New("error decoding testdata/badpem.crt: not a valid PEM encoded block")}, - {"testdata/badder.crt", errors.New("error parsing testdata/badder.crt: asn1: syntax error: data truncated")}, + {"testdata/badder.crt", errors.New("error parsing testdata/badder.crt: x509:")}, {"testdata/openssl.p256.pem", errors.New("error decoding PEM: file 'testdata/openssl.p256.pem' does not contain a certificate")}, } @@ -259,7 +259,7 @@ func TestReadCertificateBundle(t *testing.T) { {"testdata/notexists.crt", 0, errors.New("open testdata/notexists.crt failed: no such file or directory")}, {"testdata/badca.crt", 0, errors.New("error parsing testdata/badca.crt")}, {"testdata/badpem.crt", 0, errors.New("error decoding PEM: file 'testdata/badpem.crt' contains unexpected data")}, - {"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt: asn1: syntax error: data truncated")}, + {"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt: x509:")}, {"testdata/openssl.p256.pem", 0, errors.New("error decoding PEM: file 'testdata/openssl.p256.pem' is not a certificate bundle")}, } diff --git a/crypto/x509util/identity_test.go b/crypto/x509util/identity_test.go index 06020356..4e9ba728 100644 --- a/crypto/x509util/identity_test.go +++ b/crypto/x509util/identity_test.go @@ -26,7 +26,7 @@ func TestLoadIdentityFromDisk(t *testing.T) { crtPath: testBadCert, keyPath: "", pass: "", - err: errors.Errorf("error parsing %s: asn1: syntax error: trailing data", + err: errors.Errorf("error parsing %s: x509: trailing data", testBadCert), }, "error parsing rsa key": { From 04a4ce7aaffbdca562e6da7c0227b4004223ac96 Mon Sep 17 00:00:00 2001 From: davideger Date: Fri, 3 Sep 2021 15:02:00 -0700 Subject: [PATCH 2/5] Update crypto/pemutil/pem_test.go Co-authored-by: Mariano Cano --- crypto/pemutil/pem_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/pemutil/pem_test.go b/crypto/pemutil/pem_test.go index 3c4249e2..667147cb 100644 --- a/crypto/pemutil/pem_test.go +++ b/crypto/pemutil/pem_test.go @@ -230,7 +230,7 @@ func TestReadCertificate(t *testing.T) { {"testdata/notexists.crt", errors.New("open testdata/notexists.crt failed: no such file or directory")}, {"testdata/badca.crt", errors.New("error parsing testdata/badca.crt")}, {"testdata/badpem.crt", errors.New("error decoding testdata/badpem.crt: not a valid PEM encoded block")}, - {"testdata/badder.crt", errors.New("error parsing testdata/badder.crt: x509:")}, + {"testdata/badder.crt", errors.New("error parsing testdata/badder.crt:")}, {"testdata/openssl.p256.pem", errors.New("error decoding PEM: file 'testdata/openssl.p256.pem' does not contain a certificate")}, } From 638897281d10d8bf511dac813b509805e643c574 Mon Sep 17 00:00:00 2001 From: davideger Date: Fri, 3 Sep 2021 15:02:07 -0700 Subject: [PATCH 3/5] Update crypto/x509util/identity_test.go Co-authored-by: Mariano Cano --- crypto/x509util/identity_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/x509util/identity_test.go b/crypto/x509util/identity_test.go index 4e9ba728..1b411ea2 100644 --- a/crypto/x509util/identity_test.go +++ b/crypto/x509util/identity_test.go @@ -26,7 +26,7 @@ func TestLoadIdentityFromDisk(t *testing.T) { crtPath: testBadCert, keyPath: "", pass: "", - err: errors.Errorf("error parsing %s: x509: trailing data", + err: errors.Errorf("error parsing %s:", testBadCert), }, "error parsing rsa key": { From 8ea2d13f33eb6660060332860dcb9483b9ee5b1f Mon Sep 17 00:00:00 2001 From: davideger Date: Fri, 3 Sep 2021 15:02:27 -0700 Subject: [PATCH 4/5] Update crypto/pemutil/pem_test.go Co-authored-by: Mariano Cano --- crypto/pemutil/pem_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/pemutil/pem_test.go b/crypto/pemutil/pem_test.go index 667147cb..b877e5c7 100644 --- a/crypto/pemutil/pem_test.go +++ b/crypto/pemutil/pem_test.go @@ -259,7 +259,7 @@ func TestReadCertificateBundle(t *testing.T) { {"testdata/notexists.crt", 0, errors.New("open testdata/notexists.crt failed: no such file or directory")}, {"testdata/badca.crt", 0, errors.New("error parsing testdata/badca.crt")}, {"testdata/badpem.crt", 0, errors.New("error decoding PEM: file 'testdata/badpem.crt' contains unexpected data")}, - {"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt: x509:")}, + {"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt::")}, {"testdata/openssl.p256.pem", 0, errors.New("error decoding PEM: file 'testdata/openssl.p256.pem' is not a certificate bundle")}, } From 024e266c29686ed96542251c9ee1920f9f53be15 Mon Sep 17 00:00:00 2001 From: Mariano Cano Date: Fri, 3 Sep 2021 15:06:09 -0700 Subject: [PATCH 5/5] Remove extra colon --- crypto/pemutil/pem_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/pemutil/pem_test.go b/crypto/pemutil/pem_test.go index b877e5c7..45c91a02 100644 --- a/crypto/pemutil/pem_test.go +++ b/crypto/pemutil/pem_test.go @@ -259,7 +259,7 @@ func TestReadCertificateBundle(t *testing.T) { {"testdata/notexists.crt", 0, errors.New("open testdata/notexists.crt failed: no such file or directory")}, {"testdata/badca.crt", 0, errors.New("error parsing testdata/badca.crt")}, {"testdata/badpem.crt", 0, errors.New("error decoding PEM: file 'testdata/badpem.crt' contains unexpected data")}, - {"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt::")}, + {"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt:")}, {"testdata/openssl.p256.pem", 0, errors.New("error decoding PEM: file 'testdata/openssl.p256.pem' is not a certificate bundle")}, }