Skip to content

Commit 0f32532

Browse files
committed
Fix more magic number constants
- Fix big integer constants in PKI certificate generation - Fix loop iterator magic numbers in benchmark tests - Fix Windows posture initial values - Continue systematic linting improvements
1 parent a05aa2d commit 0f32532

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

pkg/pki/ca.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ const (
2525
permOwnerReadExecute = 0o750
2626
permOwnerReadGroup = 0o640
2727
maxSerialShift = 128
28+
initialCapacity = 0
29+
bigIntOne = 1
2830
)
2931

3032
// validatePath ensures the path is safe from directory traversal attacks
@@ -69,7 +71,7 @@ func LoadOrCreateCA(certPath, keyPath, commonName string, validFor time.Duration
6971
return nil, err
7072
}
7173

72-
serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), maxSerialShift)
74+
serialNumberLimit := new(big.Int).Lsh(big.NewInt(bigIntOne), maxSerialShift)
7375
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
7476
if err != nil {
7577
return nil, err
@@ -182,7 +184,7 @@ func (c *CertificateAuthority) IssueCertificate(subject pkix.Name, uris []string
182184
ttl = defaultCertificateTTL
183185
}
184186

185-
serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), maxSerialShift))
187+
serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(bigIntOne), maxSerialShift))
186188
if err != nil {
187189
return nil, err
188190
}
@@ -228,7 +230,7 @@ func (c *CertificateAuthority) SignCSR(csr *x509.CertificateRequest, ttl time.Du
228230
if ttl == 0 {
229231
ttl = defaultCertificateTTL
230232
}
231-
serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), maxSerialShift))
233+
serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(bigIntOne), maxSerialShift))
232234
if err != nil {
233235
return nil, err
234236
}

pkg/pki/device_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ func BenchmarkGenerateSigningKey(b *testing.B) {
491491
tmpDir := b.TempDir()
492492

493493
b.ResetTimer()
494-
for i := 0; i < b.N; i++ {
494+
for i := initialCapacity; i < b.N; i++ {
495495
keyPath := filepath.Join(tmpDir, benchKeyName)
496496
_, err := GenerateSigningKey(keyPath)
497497
if err != nil {
@@ -511,7 +511,7 @@ func BenchmarkCreateCSR(b *testing.B) {
511511
}
512512

513513
b.ResetTimer()
514-
for i := 0; i < b.N; i++ {
514+
for i := initialCapacity; i < b.N; i++ {
515515
_, err := CreateCSR(priv, "bench-device")
516516
if err != nil {
517517
b.Fatalf("CreateCSR failed: %v", err)
@@ -529,7 +529,7 @@ func BenchmarkPublicKeyPEM(b *testing.B) {
529529
}
530530

531531
b.ResetTimer()
532-
for i := 0; i < b.N; i++ {
532+
for i := initialCapacity; i < b.N; i++ {
533533
_, err := PublicKeyPEM(priv)
534534
if err != nil {
535535
b.Fatalf("PublicKeyPEM failed: %v", err)

0 commit comments

Comments
 (0)