feat: Cert2Der support multiple certs

Laisky · Mar 14, 2023 · fdeaa43 · fdeaa43
1 parent c39f3d1
commit fdeaa43
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/crypto/aes_test.go b/crypto/aes_test.go
@@ -114,6 +114,7 @@ func TestAEADDecrypt(t *testing.T) {
 		args args
 	}{
 		{"", args{key, []byte("fhwkufhuweh"), []byte("laisky")}},
+		{"", args{key, []byte("31231"), nil}},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/crypto/tls.go b/crypto/tls.go
@@ -135,13 +135,21 @@ func Pubkey2Pem(key crypto.PublicKey) ([]byte, error) {
 }
 
 // Cert2Pem marshal x509 certificate to pem
-func Cert2Pem(cert *x509.Certificate) []byte {
-	return CertDer2Pem(Cert2Der(cert))
+func Cert2Pem(certs ...*x509.Certificate) (ret []byte) {
+	for i := range certs {
+		ret = append(ret, CertDer2Pem(Cert2Der(certs[i]))...)
+	}
+
+	return
 }
 
 // Cert2Der marshal private key by x509.8
-func Cert2Der(cert *x509.Certificate) []byte {
-	return cert.Raw
+func Cert2Der(cert ...*x509.Certificate) (ret []byte) {
+	for i := range cert {
+		ret = append(ret, cert[i].Raw...)
+	}
+
+	return
 }
 
 // Der2Cert parse sigle certificate in der

diff --git a/crypto/tls_test.go b/crypto/tls_test.go
@@ -239,6 +239,13 @@ func TestPem2Der_multi_certs(t *testing.T) {
 
 	require.Equal(t, "sgx-coordinator-inter", cs[0].Subject.CommonName)
 	require.Equal(t, "sgx-coordinator", cs[1].Subject.CommonName)
+
+	gotder := Cert2Der(cs...)
+	require.Equal(t, der, gotder)
+
+	gotder, err = Pem2Der(Cert2Pem(cs...))
+	require.NoError(t, err)
+	require.Equal(t, der, gotder)
 }
 
 func TestSecureCipherSuites(t *testing.T) {