This commit is contained in:
Pim van Pelt
2025-08-24 11:11:25 +02:00
parent f26322e56b
commit 9b1dd06acf

View File

@@ -30,24 +30,24 @@ type Config struct {
} }
type Log struct { type Log struct {
ShortName string `yaml:"shortname"` ShortName string `yaml:"shortname"`
Inception string `yaml:"inception"` Inception string `yaml:"inception"`
Period int `yaml:"period"` Period int `yaml:"period"`
PoolSize int `yaml:"poolsize"` PoolSize int `yaml:"poolsize"`
SubmissionPrefix string `yaml:"submissionprefix"` SubmissionPrefix string `yaml:"submissionprefix"`
MonitoringPrefix string `yaml:"monitoringprefix"` MonitoringPrefix string `yaml:"monitoringprefix"`
CCadbRoots string `yaml:"ccadbroots"` CCadbRoots string `yaml:"ccadbroots"`
ExtraRoots string `yaml:"extraroots"` ExtraRoots string `yaml:"extraroots"`
Secret string `yaml:"secret"` Secret string `yaml:"secret"`
Cache string `yaml:"cache"` Cache string `yaml:"cache"`
LocalDirectory string `yaml:"localdirectory"` LocalDirectory string `yaml:"localdirectory"`
NotAfterStart time.Time `yaml:"notafterstart"` NotAfterStart time.Time `yaml:"notafterstart"`
NotAfterLimit time.Time `yaml:"notafterlimit"` NotAfterLimit time.Time `yaml:"notafterlimit"`
// Computed fields // Computed fields
LogID string LogID string
PublicKeyPEM string PublicKeyPEM string
PublicKeyDERB64 string PublicKeyDERB64 string
PublicKeyBase64 string PublicKeyBase64 string
} }
const htmlTemplate = `<!DOCTYPE html> const htmlTemplate = `<!DOCTYPE html>
@@ -291,19 +291,19 @@ func computeKeyInfo(logEntry *Log) error {
logEntry.LogID = logID logEntry.LogID = logID
logEntry.PublicKeyPEM = string(pubKeyPEM) logEntry.PublicKeyPEM = string(pubKeyPEM)
logEntry.PublicKeyDERB64 = pubKeyDERB64 logEntry.PublicKeyDERB64 = pubKeyDERB64
logEntry.PublicKeyBase64 = pubKeyDERB64 // Same as DER base64 for JSON logEntry.PublicKeyBase64 = pubKeyDERB64 // Same as DER base64 for JSON
return nil return nil
} }
type LogV3JSON struct { type LogV3JSON struct {
Description string `json:"description"` Description string `json:"description"`
SubmissionURL string `json:"submission_url"` SubmissionURL string `json:"submission_url"`
MonitoringURL string `json:"monitoring_url"` MonitoringURL string `json:"monitoring_url"`
TemporalInterval TemporalInterval `json:"temporal_interval"` TemporalInterval TemporalInterval `json:"temporal_interval"`
LogID string `json:"log_id"` LogID string `json:"log_id"`
Key string `json:"key"` Key string `json:"key"`
MMD int `json:"mmd"` MMD int `json:"mmd"`
} }
type TemporalInterval struct { type TemporalInterval struct {