0.34.2_agent

docker-agent/certificate.go

@@ -24,18 +24,26 @@ func certificateFingerprintDER(der []byte) string {
 	return hex.EncodeToString(sum[:])
 }
 
-func certificateFingerprint(certFile string) (string, error) {
+func readCertificate(certFile string) (*x509.Certificate, error) {
 	raw, err := os.ReadFile(certFile)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	block, _ := pem.Decode(raw)
 	if block == nil || block.Type != "CERTIFICATE" {
-		return "", fmt.Errorf("%s does not contain a PEM certificate", certFile)
+		return nil, fmt.Errorf("%s does not contain a PEM certificate", certFile)
 	}
 	cert, err := x509.ParseCertificate(block.Bytes)
 	if err != nil {
-		return "", fmt.Errorf("parse certificate: %w", err)
+		return nil, fmt.Errorf("parse certificate: %w", err)
+	}
+	return cert, nil
+}
+
+func certificateFingerprint(certFile string) (string, error) {
+	cert, err := readCertificate(certFile)
+	if err != nil {
+		return "", err
 	}
 	return certificateFingerprintDER(cert.Raw), nil
 }