Skip to content

Commit 89c42be

Browse files
committed
Reduce built-in certificate store memory
1 parent 553cfa1 commit 89c42be

5 files changed

Lines changed: 429 additions & 312 deletions

File tree

cmd/internal/update_certificates/main.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ package certificate
4545
4646
import "crypto/x509"
4747
48-
var mozillaIncluded *x509.CertPool
49-
50-
func init() {
51-
mozillaIncluded = x509.NewCertPool()
48+
func newMozillaIncluded() *x509.CertPool {
49+
pool := x509.NewCertPool()
5250
`)
5351
for {
5452
record, err := reader.Read()
@@ -63,14 +61,14 @@ func init() {
6361
generated.WriteString("\n // ")
6462
generated.WriteString(record[nameIndex])
6563
generated.WriteString("\n")
66-
generated.WriteString(" mozillaIncluded.AppendCertsFromPEM([]byte(`")
64+
generated.WriteString(" pool.AppendCertsFromPEM([]byte(`")
6765
cert := record[certIndex]
6866
// Remove single quotes
6967
cert = cert[1 : len(cert)-1]
7068
generated.WriteString(cert)
7169
generated.WriteString("`))\n")
7270
}
73-
generated.WriteString("}\n")
71+
generated.WriteString("\treturn pool\n}\n")
7472
return os.WriteFile("common/certificate/mozilla.go", []byte(generated.String()), 0o644)
7573
}
7674

@@ -131,10 +129,8 @@ package certificate
131129
132130
import "crypto/x509"
133131
134-
var chromeIncluded *x509.CertPool
135-
136-
func init() {
137-
chromeIncluded = x509.NewCertPool()
132+
func newChromeIncluded() *x509.CertPool {
133+
pool := x509.NewCertPool()
138134
`)
139135
for {
140136
record, err := reader.Read()
@@ -152,7 +148,7 @@ func init() {
152148
generated.WriteString("\n // ")
153149
generated.WriteString(record[subjectIndex])
154150
generated.WriteString("\n")
155-
generated.WriteString(" chromeIncluded.AppendCertsFromPEM([]byte(`")
151+
generated.WriteString(" pool.AppendCertsFromPEM([]byte(`")
156152
cert := record[certIndex]
157153
// Remove single quotes if present
158154
if len(cert) > 0 && cert[0] == '\'' {
@@ -161,6 +157,6 @@ func init() {
161157
generated.WriteString(cert)
162158
generated.WriteString("`))\n")
163159
}
164-
generated.WriteString("}\n")
160+
generated.WriteString("\treturn pool\n}\n")
165161
return os.WriteFile("common/certificate/chrome.go", []byte(generated.String()), 0o644)
166162
}

0 commit comments

Comments
 (0)