Include public key details for x.509 certificates

edutko · Jun 20, 2023 · dc795eb · dc795eb
1 parent 2dfcef0
commit dc795eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/internal/file/der.go b/internal/file/der.go
@@ -42,17 +42,24 @@ func parseCertificate(der []byte) (Info, error) {
 		return UnknownASN1Data, err
 	}
 
-	return Info{
+	info := Info{
 		Description: "x.509 certificate",
 		Attributes: []Attribute{
 			{"Serial", c.SerialNumber.String()},
 			{"Subject", c.Subject.String()},
 			{"Issuer", c.Issuer.String()},
 			{"Expiration", c.NotAfter.Format("2006-01-02")},
-			{"Public key algorithm", c.PublicKeyAlgorithm.String()},
 			{"Signature algorithm", c.SignatureAlgorithm.String()},
 		},
-	}, nil
+		Children: []Info{
+			{
+				Description: "Public key",
+				Attributes:  cryptoPublicKeyAttributes(c.PublicKey),
+			},
+		},
+	}
+
+	return info, nil
 }
 
 func parsePKCS1PublicKey(der []byte) (Info, error) {

diff --git a/internal/file/parsers.go b/internal/file/parsers.go
@@ -50,6 +50,7 @@ func PEMFile(info Info, data []byte) (Info, error) {
 	if len(blockInfos) == 1 {
 		info.Description = blockInfos[0].Description
 		info.Attributes = blockInfos[0].Attributes
+		info.Children = blockInfos[0].Children
 		return info, nil
 
 	} else if len(blockInfos) > 1 {