Merge branch 'release/v0.5.2'

enbility · Jul 16, 2024 · 23931b8 · 23931b8
2 parents 0037fc7 + e8c7aab
commit 23931b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/cert/cert.go b/cert/cert.go
@@ -33,14 +33,14 @@ func CreateCertificate(organizationalUnit, organization, country, commonName str
 		return tls.Certificate{}, err
 	}
 
-	// Create the EEBUS service SKI using the private key
-	asn1, err := x509.MarshalECPrivateKey(privateKey)
+	// Create the EEBUS service SKI using the public key
+	publicKey, err := privateKey.PublicKey.ECDH()
 	if err != nil {
 		return tls.Certificate{}, err
 	}
 	// SHIP 12.2: Required to be created according to RFC 3280 4.2.1.2
 	// #nosec G401
-	ski := sha1.Sum(asn1)
+	ski := sha1.Sum(publicKey.Bytes())
 
 	subject := pkix.Name{
 		OrganizationalUnit: []string{organizationalUnit},

diff --git a/cert/cert_test.go b/cert/cert_test.go
@@ -59,14 +59,14 @@ func createInvalidCertificate(organizationalUnit, organization, country, commonN
 		return tls.Certificate{}, err
 	}
 
-	// Create the EEBUS service SKI using the private key
-	asn1, err := x509.MarshalECPrivateKey(privateKey)
+	// Create the EEBUS service SKI using the public key
+	publicKey, err := privateKey.PublicKey.ECDH()
 	if err != nil {
 		return tls.Certificate{}, err
 	}
 	// SHIP 12.2: Required to be created according to RFC 3280 4.2.1.2
 	// #nosec G401
-	ski := sha1.Sum(asn1)
+	ski := sha1.Sum(publicKey.Bytes())
 
 	subject := pkix.Name{
 		OrganizationalUnit: []string{organizationalUnit},

diff --git a/mdns/mdns.go b/mdns/mdns.go
@@ -397,6 +397,10 @@ func (m *MdnsManager) processMdnsEntry(elements map[string]string, name, host st
 }
 
 func (m *MdnsManager) RequestMdnsEntries() {
+	if m.report == nil {
+		return
+	}
+
 	entries := m.copyMdnsEntries()
 	go m.report.ReportMdnsEntries(entries)
 }