tidy code

fullstorydev · Nov 11, 2023 · 37b5977 · 37b5977
1 parent 03597fd
commit 37b5977
Show file tree

Hide file tree

Showing 22 changed files with 211 additions and 377 deletions.
diff --git a/internal/certigo/lib/certs_test.go b/internal/certigo/lib/certs_test.go
@@ -8,12 +8,12 @@ func TestClientTLSConfig(t *testing.T) {
 	derfmt := CertKeyFormatDER
 	pemfmt := CertKeyFormatPEM
 	pfxfmt := CertKeyFormatPKCS12
-	testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client.crt", pemfmt, "tls/client.key", pemfmt, "")
-	testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client.der", derfmt, "tls/client.key", pemfmt, "")
-	testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client.pfx", pfxfmt, "tls/client.key", pemfmt, "")
-	testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client_pass.pfx", pfxfmt, "", pemfmt, "pfxpassword")
-	testTLSConfig(t, false, "tls/ca.der", derfmt, "tls/client.pfx", pfxfmt, "", pemfmt, "")
-	testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/testcert.pem", pemfmt, "tls/testkey.pem", pemfmt, "")
+	testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client.crt", pemfmt, "internal/testing/tls/client.key", pemfmt, "")
+	testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client.der", derfmt, "internal/testing/tls/client.key", pemfmt, "")
+	testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client.pfx", pfxfmt, "internal/testing/tls/client.key", pemfmt, "")
+	testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/client_pass.pfx", pfxfmt, "", pemfmt, "pfxpassword")
+	testTLSConfig(t, false, "internal/testing/tls/ca.der", derfmt, "internal/testing/tls/client.pfx", pfxfmt, "", pemfmt, "")
+	testTLSConfig(t, false, "internal/testing/tls/ca.crt", pemfmt, "internal/testing/tls/testcert.pem", pemfmt, "internal/testing/tls/testkey.pem", pemfmt, "")
 }
 
 func testTLSConfig(
@@ -38,12 +38,12 @@ func testTLSConfig(
 }
 
 func TestGuessFormat(t *testing.T) {
-	guessFormat(t, "tls/client.crt", CertKeyFormatPEM)
-	guessFormat(t, "tls/client.cer", CertKeyFormatPEM)
-	guessFormat(t, "tls/client.key", CertKeyFormatPEM)
-	guessFormat(t, "tls/client.pfx", CertKeyFormatPKCS12)
-	guessFormat(t, "tls/client.der", CertKeyFormatDER)
-	forceFormat(t, "tls/client.guess", CertKeyFormatPEM, CertKeyFormatPEM)
+	guessFormat(t, "internal/testing/tls/client.crt", CertKeyFormatPEM)
+	guessFormat(t, "internal/testing/tls/client.cer", CertKeyFormatPEM)
+	guessFormat(t, "internal/testing/tls/client.key", CertKeyFormatPEM)
+	guessFormat(t, "internal/testing/tls/client.pfx", CertKeyFormatPKCS12)
+	guessFormat(t, "internal/testing/tls/client.der", CertKeyFormatDER)
+	forceFormat(t, "internal/testing/tls/client.guess", CertKeyFormatPEM, CertKeyFormatPEM)
 }
 
 func guessFormat(t *testing.T, filename string, formatExpected CertificateKeyFormat) {

diff --git a/internal/certigo/lib/tls/ca.crl b/internal/certigo/lib/tls/ca.crl
diff --git a/internal/certigo/lib/tls/ca.crt b/internal/certigo/lib/tls/ca.crt
diff --git a/internal/certigo/lib/tls/ca.der b/internal/certigo/lib/tls/ca.der
diff --git a/internal/certigo/lib/tls/ca.key b/internal/certigo/lib/tls/ca.key
diff --git a/internal/certigo/lib/tls/client.cer b/internal/certigo/lib/tls/client.cer
diff --git a/internal/certigo/lib/tls/client.crt b/internal/certigo/lib/tls/client.crt
diff --git a/internal/certigo/lib/tls/client.csr b/internal/certigo/lib/tls/client.csr
diff --git a/internal/certigo/lib/tls/client.der b/internal/certigo/lib/tls/client.der