add testfile tls/testcert.pem tls/testkey.pem

fullstorydev · Nov 11, 2023 · 3dad42b · 3dad42b
1 parent ede18a4
commit 3dad42b
Show file tree

Hide file tree

Showing 24 changed files with 280 additions and 399 deletions.
diff --git a/internal/certigo/lib/certs.go b/internal/certigo/lib/certs.go
@@ -162,7 +162,6 @@ func GuessFormatForFile(filename string, format CertificateKeyFormat) (Certifica
 
 	// Heuristics for guessing -- best effort.
 	magic := binary.BigEndian.Uint32(data)
-	fmt.Printf(" magic 0x%0x\n", magic)
 	if magic == 0xCECECECE || magic == 0xFEEDFEED {
 		// JCEKS/JKS files always start with this prefix
 		return CertKeyFormatJCEKS, nil
@@ -355,7 +354,6 @@ func readCertsFromStream(reader io.Reader, filename string, format CertificateKe
 		x509Certs, err0 := x509.ParseCertificates(data)
 		if err0 == nil {
 			for _, cert := range x509Certs {
-				fmt.Printf("cert cn: %v\n", cert.Issuer.CommonName)
 				err := callback(encodeX509ToPEM(cert, headers), format)
 				if err != nil {
 					return err

diff --git a/internal/certigo/lib/certs_test.go b/internal/certigo/lib/certs_test.go
@@ -8,14 +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/client.crt", pemfmt, "tls/client.key.pass", pemfmt, "123456") // not support
-	//testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client_pass.pfx", pfxfmt, "", pemfmt, "invalidpwd") // invalid
-	//testTLSConfig(t, false, "tls/ca.crt", pemfmt, "tls/client.der", derfmt, "tls/client.key.der", derfmt, "") key can not be der
+	testTLSConfig(t, false, "../../testing/tls/ca.crt", pemfmt, "../../testing/tls/client.crt", pemfmt, "../../testing/tls/client.key", pemfmt, "")
+	testTLSConfig(t, false, "../../testing/tls/ca.crt", pemfmt, "../../testing/tls/client.der", derfmt, "../../testing/tls/client.key", pemfmt, "")
+	testTLSConfig(t, false, "../../testing/tls/ca.crt", pemfmt, "../../testing/tls/client.pfx", pfxfmt, "../../testing/tls/client.key", pemfmt, "")
+	testTLSConfig(t, false, "../../testing/tls/ca.crt", pemfmt, "../../testing/tls/client_pass.pfx", pfxfmt, "", pemfmt, "pfxpassword")
+	testTLSConfig(t, false, "../../testing/tls/ca.der", derfmt, "../../testing/tls/client.pfx", pfxfmt, "", pemfmt, "")
+	testTLSConfig(t, false, "../../testing/tls/ca.crt", pemfmt, "../../testing/tls/testcert.pem", pemfmt, "../../testing/tls/testkey.pem", pemfmt, "")
 }
 
 func testTLSConfig(
@@ -40,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, "../../testing/tls/client.crt", CertKeyFormatPEM)
+	guessFormat(t, "../../testing/tls/client.cer", CertKeyFormatPEM)
+	guessFormat(t, "../../testing/tls/client.key", CertKeyFormatPEM)
+	guessFormat(t, "../../testing/tls/client.pfx", CertKeyFormatPKCS12)
+	guessFormat(t, "../../testing/tls/client.der", CertKeyFormatDER)
+	forceFormat(t, "../../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