Skip to content

Commit 37b5977

Browse files
committed
tidy code
1 parent 03597fd commit 37b5977

22 files changed

+211
-377
lines changed

internal/certigo/lib/certs_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ func TestClientTLSConfig(t *testing.T) {
88
derfmt := CertKeyFormatDER
99
pemfmt := CertKeyFormatPEM
1010
pfxfmt := CertKeyFormatPKCS12
11-
testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client.crt", pemfmt, "tls/client.key", pemfmt, "")
12-
testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client.der", derfmt, "tls/client.key", pemfmt, "")
13-
testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client.pfx", pfxfmt, "tls/client.key", pemfmt, "")
14-
testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client_pass.pfx", pfxfmt, "", pemfmt, "pfxpassword")
15-
testTLSConfig(t, false, "tls/ca.der", derfmt, "tls/client.pfx", pfxfmt, "", pemfmt, "")
16-
testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/testcert.pem", pemfmt, "tls/testkey.pem", pemfmt, "")
11+
testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client.crt", pemfmt, "internal/testing/tls/client.key", pemfmt, "")
12+
testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client.der", derfmt, "internal/testing/tls/client.key", pemfmt, "")
13+
testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client.pfx", pfxfmt, "internal/testing/tls/client.key", pemfmt, "")
14+
testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client_pass.pfx", pfxfmt, "", pemfmt, "pfxpassword")
15+
testTLSConfig(t, false, "internal/testing/tls/ca.der", derfmt, "internal/testing/tls/client.pfx", pfxfmt, "", pemfmt, "")
16+
testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/testcert.pem", pemfmt, "internal/testing/tls/testkey.pem", pemfmt, "")
1717
}
1818

1919
func testTLSConfig(
@@ -38,12 +38,12 @@ func testTLSConfig(
3838
}
3939

4040
func TestGuessFormat(t *testing.T) {
41-
guessFormat(t, "tls/client.crt", CertKeyFormatPEM)
42-
guessFormat(t, "tls/client.cer", CertKeyFormatPEM)
43-
guessFormat(t, "tls/client.key", CertKeyFormatPEM)
44-
guessFormat(t, "tls/client.pfx", CertKeyFormatPKCS12)
45-
guessFormat(t, "tls/client.der", CertKeyFormatDER)
46-
forceFormat(t, "tls/client.guess", CertKeyFormatPEM, CertKeyFormatPEM)
41+
guessFormat(t, "internal/testing/tls/client.crt", CertKeyFormatPEM)
42+
guessFormat(t, "internal/testing/tls/client.cer", CertKeyFormatPEM)
43+
guessFormat(t, "internal/testing/tls/client.key", CertKeyFormatPEM)
44+
guessFormat(t, "internal/testing/tls/client.pfx", CertKeyFormatPKCS12)
45+
guessFormat(t, "internal/testing/tls/client.der", CertKeyFormatDER)
46+
forceFormat(t, "internal/testing/tls/client.guess", CertKeyFormatPEM, CertKeyFormatPEM)
4747
}
4848

4949
func guessFormat(t *testing.T, filename string, formatExpected CertificateKeyFormat) {

internal/certigo/lib/tls/ca.crl

-16
This file was deleted.

internal/certigo/lib/tls/ca.crt

-28
This file was deleted.

internal/certigo/lib/tls/ca.der

-1.22 KB
Binary file not shown.

internal/certigo/lib/tls/ca.key

-51
This file was deleted.

internal/certigo/lib/tls/client.cer

-101
This file was deleted.

internal/certigo/lib/tls/client.crt

-25
This file was deleted.

internal/certigo/lib/tls/client.csr

-16
This file was deleted.

internal/certigo/lib/tls/client.der

-1.05 KB
Binary file not shown.

0 commit comments

Comments
 (0)