From 9dcc64e8caac59a881e6bccbbe17aec7ef869219 Mon Sep 17 00:00:00 2001
From: Derek Marcotte <554b8425@razorfever.net>
Date: Thu, 14 Nov 2024 09:16:37 -0500
Subject: [PATCH] Update ComputeSKI to use SHA-256 per RFC 7093 Section 2(1).

---
 signer/signer.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/signer/signer.go b/signer/signer.go
index d5b1f96f0..b22d7220d 100644
--- a/signer/signer.go
+++ b/signer/signer.go
@@ -8,6 +8,7 @@ import (
 	"crypto/elliptic"
 	"crypto/rsa"
 	"crypto/sha1"
+	"crypto/sha256"
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/asn1"
@@ -263,8 +264,9 @@ type subjectPublicKeyInfo struct {
 }
 
 // ComputeSKI derives an SKI from the certificate's public key in a
-// standard manner. This is done by computing the SHA-1 digest of the
-// SubjectPublicKeyInfo component of the certificate.
+// standard manner. This is done by computing the SHA-256 digest of the
+// SubjectPublicKeyInfo component of the certificate, and returning the
+// leftmost 160 bits, per RFC 7093 Section 2(1).
 func ComputeSKI(template *x509.Certificate) ([]byte, error) {
 	pub := template.PublicKey
 	encodedPub, err := x509.MarshalPKIXPublicKey(pub)
@@ -278,8 +280,8 @@ func ComputeSKI(template *x509.Certificate) ([]byte, error) {
 		return nil, err
 	}
 
-	pubHash := sha1.Sum(subPKI.SubjectPublicKey.Bytes)
-	return pubHash[:], nil
+	pubHash := sha256.Sum256(subPKI.SubjectPublicKey.Bytes)
+	return pubHash[:20], nil
 }
 
 // FillTemplate is a utility function that tries to load as much of