From ad6b987c913425a0d3d35b56ca68ea8ea0d6372f Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 11 Dec 2022 13:32:05 +0100 Subject: [PATCH] Implement sign certificate command - decouple config and messages - cainfo maps from config.Profile to messages.CAProfile - config parses profile usage - validity can be configured per certificate profile, defaults are defined in a defaultValidity method of the profile usage - the client simulator emits certificate signing requests at random intervals - add implementation of SingCertificateCommand to MsgPackHandler - remove indirection signing.RequestSignature --- cmd/clientsim/main.go | 54 +- cmd/signer/main.go | 55 +- internal/cainfo/cainfo.go | 19 +- internal/config/config.go | 69 +- internal/config/config_test.go | 24 + internal/handler/msgpack.go | 73 ++ internal/hsm/hsm.go | 2 +- internal/x509/signing/signer.go | 30 +- internal/x509/signing/signing.go | 310 +++++- internal/x509/signing/signing_test.go | 116 +- pkg/messages/messages.go | 254 ++--- pkg/messages/messages_it_test.go | 26 +- pkg/messages/messages_test.go | 105 +- pkg/messages/resolver.msgpackgen.go | 1439 +++++++++++++++---------- 14 files changed, 1615 insertions(+), 961 deletions(-) diff --git a/cmd/clientsim/main.go b/cmd/clientsim/main.go index f030d90..0ee818f 100644 --- a/cmd/clientsim/main.go +++ b/cmd/clientsim/main.go @@ -21,10 +21,15 @@ package main import ( "context" + "crypto" + "crypto/ecdsa" + "crypto/elliptic" "crypto/rand" "crypto/x509" + "crypto/x509/pkix" "fmt" "io" + mathRand "math/rand" "os" "sort" "time" @@ -52,9 +57,11 @@ func (g *TestCommandGenerator) GenerateCommands(ctx context.Context) error { } const ( - healthInterval = 5 * time.Second - crlInterval = 15 * time.Minute - startPause = 3 * time.Second + healthInterval = 5 * time.Second + crlInterval = 15 * time.Minute + startPause = 3 * time.Second + minSignInterval = 5 * time.Second + maxSignInterval = 10 * time.Second ) g.logger.Info("start generating commands") @@ -63,11 +70,12 @@ func (g *TestCommandGenerator) GenerateCommands(ctx context.Context) error { g.commands <- &protocol.Command{ Announce: messages.BuildCommandAnnounce(messages.CmdFetchCRL), - Command: &messages.FetchCRLCommand{IssuerID: "sub-ecc_person_2022"}, + Command: &messages.FetchCRLCommand{IssuerID: "ecc_person_2022"}, } healthTimer := time.NewTimer(healthInterval) crlTimer := time.NewTimer(crlInterval) + signTimer := time.NewTimer(minSignInterval) for { select { @@ -91,12 +99,48 @@ func (g *TestCommandGenerator) GenerateCommands(ctx context.Context) error { case <-crlTimer.C: g.commands <- &protocol.Command{ Announce: messages.BuildCommandAnnounce(messages.CmdFetchCRL), - Command: &messages.FetchCRLCommand{IssuerID: "sub-ecc_person_2022"}, + Command: &messages.FetchCRLCommand{IssuerID: "ecc_person_2022"}, } + case <-signTimer.C: + g.commands <- &protocol.Command{ + Announce: messages.BuildCommandAnnounce(messages.CmdSignCertificate), + Command: &messages.SignCertificateCommand{ + IssuerID: "ecc_person_2022", + ProfileName: "person", + CSRData: g.generateCsr("Test Person"), + CommonName: "Test Person", + EmailAddresses: []string{"test@example.org"}, + PreferredHash: crypto.SHA256, + }, + } + + newRandomDuration := minSignInterval + time.Duration(mathRand.Int63n(int64(maxSignInterval))) + + signTimer.Reset(newRandomDuration) } } } +func (g *TestCommandGenerator) generateCsr(cn string) []byte { + keyPair, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) + if err != nil { + g.logger.WithError(err).Panic("could not generate key pair") + } + + template := &x509.CertificateRequest{ + SignatureAlgorithm: x509.ECDSAWithSHA256, + PublicKey: keyPair.Public(), + Subject: pkix.Name{CommonName: cn}, + } + + csrBytes, err := x509.CreateCertificateRequest(rand.Reader, template, keyPair) + if err != nil { + g.logger.WithError(err).Panic("could not create signing request") + } + + return csrBytes +} + type clientSimulator struct { clientHandler protocol.ClientHandler framesIn chan []byte diff --git a/cmd/signer/main.go b/cmd/signer/main.go index c54ff41..e89fce3 100644 --- a/cmd/signer/main.go +++ b/cmd/signer/main.go @@ -35,6 +35,7 @@ import ( "git.cacert.org/cacert-gosigner/internal/hsm" "git.cacert.org/cacert-gosigner/internal/serial" "git.cacert.org/cacert-gosigner/internal/x509/revoking" + "git.cacert.org/cacert-gosigner/internal/x509/signing" ) var ( @@ -94,18 +95,21 @@ func main() { healthHandler := health.New(version, access) - revokingRepositories, err := configureRepositories(caConfig, logger) + revokingRepositories, signingRepositories, err := configureRepositories(caConfig, logger) if err != nil { - logger.WithError(err).Fatal("could not setup revoking repositories") + logger.WithError(err).Fatal("could not setup repositories") } fetchCRLHandler := revoking.NewFetchCRLHandler(revokingRepositories) + signX509Handler := signing.NewSignCertificateHandler(signingRepositories) + proto, err := handler.New( logger, handler.RegisterHealthHandler(healthHandler), handler.RegisterFetchCRLHandler(fetchCRLHandler), handler.RegisterCAInfoHandler(access), + handler.RegisterCertificateSigningHandler(signX509Handler), ) if err != nil { logger.WithError(err).Fatal("could not setup protocol handler") @@ -151,26 +155,32 @@ func runSigner(logger *logrus.Logger, serialHandler *serial.Handler) error { func configureRepositories( caConfig *config.SignerConfig, logger *logrus.Logger, -) (map[string]*revoking.X509Revoking, error) { +) (map[string]*revoking.X509Revoking, map[string]map[string]*signing.X509Signing, error) { var err error - result := make(map[string]*revoking.X509Revoking) + revokers := make(map[string]*revoking.X509Revoking) + signers := make(map[string]map[string]*signing.X509Signing) for _, name := range caConfig.RootCAs() { - result[name], err = buildX509Revoking(caConfig, name, logger) + revokers[name], err = buildX509Revoking(caConfig, name, logger) if err != nil { - return nil, err + return nil, nil, err } } for _, name := range caConfig.SubordinateCAs() { - result[name], err = buildX509Revoking(caConfig, name, logger) + revokers[name], err = buildX509Revoking(caConfig, name, logger) + if err != nil { + return nil, nil, err + } + + signers[name], err = buildX509Signing(caConfig, name, logger) if err != nil { - return nil, err + return nil, nil, err } } - return result, nil + return revokers, signers, nil } func buildX509Revoking( @@ -197,6 +207,33 @@ func buildX509Revoking( ), nil } +func buildX509Signing( + caConfig *config.SignerConfig, + name string, + logger *logrus.Logger, +) (map[string]*signing.X509Signing, error) { + caDef, err := caConfig.GetCADefinition(name) + if err != nil { + return nil, fmt.Errorf("could not get CA definition for %s: %w", name, err) + } + + repo, err := caConfig.Repository(name) + if err != nil { + return nil, fmt.Errorf("could not get repository for %s: %w", name, err) + } + + result := make(map[string]*signing.X509Signing) + + for _, prof := range caDef.Profiles { + result[prof.Name] = signing.NewX509Signing(signing.NewProfile( + logger, caDef.KeyPair, caDef.Certificate, prof.Name, + []string{caConfig.BuildOCSPURL(caDef)}, prof.UseFor, prof.Years, prof.Months, prof.Days, + ), repo) + } + + return result, nil +} + func initializeHSM(caConfig *config.SignerConfig, setupMode, verbose bool, logger *logrus.Logger) *hsm.Access { opts := make([]hsm.ConfigOption, 0) diff --git a/internal/cainfo/cainfo.go b/internal/cainfo/cainfo.go index 60edfad..f1edb52 100644 --- a/internal/cainfo/cainfo.go +++ b/internal/cainfo/cainfo.go @@ -17,7 +17,10 @@ limitations under the License. package cainfo -import "git.cacert.org/cacert-gosigner/pkg/messages" +import ( + "git.cacert.org/cacert-gosigner/internal/config" + "git.cacert.org/cacert-gosigner/pkg/messages" +) type Result struct { Certificate []byte @@ -27,3 +30,17 @@ type Result struct { type Handler interface { GetCAInfo(string) (*Result, error) } + +func MapProfiles(profiles []config.Profile) []messages.CAProfile { + value := make([]messages.CAProfile, len(profiles)) + + for i, p := range profiles { + value[i] = messages.CAProfile{ + Name: p.Name, + Description: p.UseFor.Description(), + UseFor: p.UseFor, + } + } + + return value +} diff --git a/internal/config/config.go b/internal/config/config.go index ab2d354..39727a2 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -31,8 +31,6 @@ import ( "gopkg.in/yaml.v3" - "git.cacert.org/cacert-gosigner/pkg/messages" - "git.cacert.org/cacert-gosigner/internal/x509/openssl" "git.cacert.org/cacert-gosigner/internal/x509/revoking" "git.cacert.org/cacert-gosigner/internal/x509/signing" @@ -533,6 +531,40 @@ func nameToCurve(name string) (elliptic.Curve, error) { } } +var validProfileUsages = map[string]signing.ProfileUsage{ + "ocsp": signing.UsageOCSP, + + "client": signing.UsageClient, + "code": signing.UsageCode, + "person": signing.UsagePerson, + "server": signing.UsageServer, + "server_client": signing.UsageServerClient, + + "org_client": signing.UsageOrgClient, + "org_code": signing.UsageOrgCode, + "org_email": signing.UsageOrgEmail, + "org_person": signing.UsageOrgPerson, + "org_server": signing.UsageOrgServer, + "org_server_client": signing.UsageOrgServerClient, +} + +func ParseUsage(u string) (signing.ProfileUsage, error) { + usage, ok := validProfileUsages[u] + if !ok { + return signing.UsageInvalid, fmt.Errorf("unsupported profile usage: %s", u) + } + + return usage, nil +} + +type Profile struct { + Name string + UseFor signing.ProfileUsage + Years int + Months int + Days int +} + type CaCertificateEntry struct { KeyInfo *PrivateKeyInfo CommonName string @@ -542,7 +574,7 @@ type CaCertificateEntry struct { KeyPair crypto.Signer Parent string Storage string - Profiles []messages.CAProfile + Profiles []Profile } func (c *CaCertificateEntry) UnmarshalYAML(value *yaml.Node) error { @@ -555,8 +587,13 @@ func (c *CaCertificateEntry) UnmarshalYAML(value *yaml.Node) error { Parent string `yaml:"parent"` Storage string `yaml:"storage"` Profiles []struct { - Name string `yaml:"name"` - UseFor string `yaml:"use-for"` + Name string `yaml:"name"` + UseFor string `yaml:"use-for"` + Validity struct { + Years int `yaml:"years"` + Months int `yaml:"months"` + Days int `yaml:"days"` + } `yaml:"validity"` } `yaml:"profiles"` } @@ -598,17 +635,24 @@ func (c *CaCertificateEntry) UnmarshalYAML(value *yaml.Node) error { } if m.Profiles != nil { - c.Profiles = make([]messages.CAProfile, len(m.Profiles)) + c.Profiles = make([]Profile, len(m.Profiles)) for i, prof := range m.Profiles { - usage, err := messages.ParseUsage(prof.UseFor) + usage, err := ParseUsage(prof.UseFor) if err != nil { return fmt.Errorf("config error: %w", err) } - c.Profiles[i] = messages.CAProfile{ + if prof.Validity.Years > 0 || prof.Validity.Months > 0 || prof.Validity.Days > 0 { + prof.Validity.Years, prof.Validity.Months, prof.Validity.Days = defaultValidity(usage) + } + + c.Profiles[i] = Profile{ Name: prof.Name, UseFor: usage, + Years: prof.Validity.Years, + Months: prof.Validity.Months, + Days: prof.Validity.Days, } } } @@ -616,6 +660,15 @@ func (c *CaCertificateEntry) UnmarshalYAML(value *yaml.Node) error { return nil } +func defaultValidity(useFor signing.ProfileUsage) (years int, months int, days int) { + switch useFor { + case signing.UsagePerson, signing.UsageOrgPerson, signing.UsageOrgEmail: + return 2, 0, 0 + default: + return 1, 0, 0 + } +} + func (c *CaCertificateEntry) IsRoot() bool { return c.Parent == "" } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index ae3ba17..407e612 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -31,6 +31,7 @@ import ( "gopkg.in/yaml.v3" "git.cacert.org/cacert-gosigner/internal/config" + "git.cacert.org/cacert-gosigner/internal/x509/signing" ) type TestCurve struct { @@ -992,3 +993,26 @@ func TestSignerConfig_GetKeyStorage(t *testing.T) { assert.ErrorContains(t, err, "could not find storage definition with label") assert.Nil(t, keyStorage) } + +func TestParseUsage(t *testing.T) { + okValues := []string{ + "ocsp", "client", "code", "person", "server", "server_client", + "org_client", "org_code", "org_email", "org_person", "org_server", "org_server_client", + } + + for _, v := range okValues { + t.Run(v, func(t *testing.T) { + u, err := config.ParseUsage(v) + + assert.NoError(t, err) + assert.Greater(t, u, signing.ProfileUsage(0)) + }) + } + + t.Run("invalid", func(t *testing.T) { + u, err := config.ParseUsage("foo") + + assert.Error(t, err) + assert.Equal(t, u, signing.UsageInvalid) + }) +} diff --git a/internal/handler/msgpack.go b/internal/handler/msgpack.go index 67ac37f..b649f6a 100644 --- a/internal/handler/msgpack.go +++ b/internal/handler/msgpack.go @@ -19,6 +19,8 @@ package handler import ( "context" + "crypto/x509" + "crypto/x509/pkix" "errors" "fmt" "math/big" @@ -30,6 +32,7 @@ import ( "git.cacert.org/cacert-gosigner/internal/cainfo" "git.cacert.org/cacert-gosigner/internal/health" "git.cacert.org/cacert-gosigner/internal/x509/revoking" + "git.cacert.org/cacert-gosigner/internal/x509/signing" "git.cacert.org/cacert-gosigner/pkg/messages" "git.cacert.org/cacert-gosigner/pkg/protocol" ) @@ -44,6 +47,7 @@ type MsgPackHandler struct { healthHandler *health.Handler certificateAuthorityInfoHandler cainfo.Handler fetchCRLHandler *revoking.FetchCRLHandler + x509SigningHandler signing.Handler } func (m *MsgPackHandler) CommandAnnounce(ctx context.Context, frames <-chan []byte) (*protocol.Command, error) { @@ -174,6 +178,18 @@ func (m *MsgPackHandler) parseFetchCRLCommand(frame []byte) (*messages.FetchCRLC return &command, nil } +func (m *MsgPackHandler) parseSignCertificateCommand(frame []byte) (*messages.SignCertificateCommand, error) { + var command messages.SignCertificateCommand + + if err := msgpack.Unmarshal(frame, &command); err != nil { + m.logger.WithError(err).Error("unmarshal failed") + + return nil, errors.New("could not unmarshal sign certificate command") + } + + return &command, nil +} + func (m *MsgPackHandler) handleCommand(command *protocol.Command) (*protocol.Response, error) { var ( responseCode messages.ResponseCode @@ -202,6 +218,13 @@ func (m *MsgPackHandler) handleCommand(command *protocol.Command) (*protocol.Res } responseCode, responseData = messages.RespFetchCRL, response + case *messages.SignCertificateCommand: + response, err := m.handleSignCertificateCommand(cmd) + if err != nil { + return nil, err + } + + responseCode, responseData = messages.RespSignCertificate, response default: return nil, fmt.Errorf("unhandled command %s", command.Announce) } @@ -242,6 +265,13 @@ func (m *MsgPackHandler) parseCommand(frame []byte, command *protocol.Command) e } command.Command = fetchCRLCommand + case messages.CmdSignCertificate: + signCertificateCommand, err := m.parseSignCertificateCommand(frame) + if err != nil { + return err + } + + command.Command = signCertificateCommand default: return fmt.Errorf("unhandled command code %s", command.Announce.Code) } @@ -315,6 +345,43 @@ func (m *MsgPackHandler) handleFetchCRLCommand(command *messages.FetchCRLCommand return response, nil } +func (m *MsgPackHandler) handleSignCertificateCommand( + command *messages.SignCertificateCommand, +) (*messages.SignCertificateResponse, error) { + csr, err := x509.ParseCertificateRequest(command.CSRData) + if err != nil { + return nil, fmt.Errorf("could not parse certificate signing request: %w", err) + } + + signerRequest := &signing.SignerRequest{ + CSR: csr, + SubjectDN: pkix.Name{CommonName: command.CommonName}, + Emails: command.EmailAddresses, + DNSNames: command.Hostnames, + PreferredHash: command.PreferredHash, + } + + if command.Organization != "" { + signerRequest.SubjectDN.Organization = []string{command.Organization} + } + + if command.OrganizationalUnit != "" { + signerRequest.SubjectDN.OrganizationalUnit = []string{command.OrganizationalUnit} + } + + x509Signing, err := m.x509SigningHandler.GetSigner(command.IssuerID, command.ProfileName) + if err != nil { + return nil, fmt.Errorf("could not get X.509 signing component: %w", err) + } + + res, err := x509Signing.Sign(signerRequest) + if err != nil { + return nil, fmt.Errorf("could not sign certificate: %w", err) + } + + return &messages.SignCertificateResponse{CertificateData: res.Certificate.Raw}, nil +} + func New(logger *logrus.Logger, handlers ...RegisterHandler) (protocol.ServerHandler, error) { messages.RegisterGeneratedResolver() @@ -348,3 +415,9 @@ func RegisterCAInfoHandler(caInfoHandler cainfo.Handler) func(handler *MsgPackHa h.certificateAuthorityInfoHandler = caInfoHandler } } + +func RegisterCertificateSigningHandler(signingHandler signing.Handler) func(handler *MsgPackHandler) { + return func(h *MsgPackHandler) { + h.x509SigningHandler = signingHandler + } +} diff --git a/internal/hsm/hsm.go b/internal/hsm/hsm.go index b18cdb3..81e8fc0 100644 --- a/internal/hsm/hsm.go +++ b/internal/hsm/hsm.go @@ -194,7 +194,7 @@ func (a *Access) GetCAInfo(name string) (*cainfo.Result, error) { return &cainfo.Result{ Certificate: certificate.Raw, - Profiles: def.Profiles, + Profiles: cainfo.MapProfiles(def.Profiles), }, nil } diff --git a/internal/x509/signing/signer.go b/internal/x509/signing/signer.go index bcea70a..d322aac 100644 --- a/internal/x509/signing/signer.go +++ b/internal/x509/signing/signer.go @@ -19,35 +19,17 @@ limitations under the License. package signing import ( + "crypto" "crypto/x509" "crypto/x509/pkix" - "time" ) type SignerRequest struct { - CSR *x509.CertificateRequest - SubjectDN pkix.Name - Emails []string - DNSNames []string - Duration time.Duration - SignatureAlgorithm x509.SignatureAlgorithm -} - -func NewSignerRequest( - csr *x509.CertificateRequest, - subjectDN pkix.Name, - emails, dnsNames []string, - duration time.Duration, - signatureAlgorithm x509.SignatureAlgorithm, -) *SignerRequest { - return &SignerRequest{ - CSR: csr, - SubjectDN: subjectDN, - Emails: emails, - DNSNames: dnsNames, - Duration: duration, - SignatureAlgorithm: signatureAlgorithm, - } + CSR *x509.CertificateRequest + SubjectDN pkix.Name + Emails []string + DNSNames []string + PreferredHash crypto.Hash } type SignerResponse struct { diff --git a/internal/x509/signing/signing.go b/internal/x509/signing/signing.go index dc9d4b4..38c008f 100644 --- a/internal/x509/signing/signing.go +++ b/internal/x509/signing/signing.go @@ -18,12 +18,23 @@ limitations under the License. package signing import ( + "crypto" + "crypto/rand" "crypto/x509" - "crypto/x509/pkix" + "encoding/asn1" "fmt" "time" + + "github.com/sirupsen/logrus" + + "git.cacert.org/cacert-gosigner/internal/x509/helper" ) +// PolicyIdentifierCAcertClass3Policy is the ASN.1 object identifier for the CAcert Class3 policy from [OIDAllocation] +// +// [OIDAllocation]: https://wiki.cacert.org/OidAllocation +var PolicyIdentifierCAcertClass3Policy = asn1.ObjectIdentifier{1, 3, 6, 4, 1, 18506, 2, 3} + type X509Signing struct { signer Signer repo Repository @@ -33,32 +44,6 @@ func NewX509Signing(signer Signer, repo Repository) *X509Signing { return &X509Signing{signer: signer, repo: repo} } -type RequestSignature struct { - rawCSRData []byte - subjectCommonName string - emails []string - dnsNames []string - duration time.Duration - signatureAlgorithm x509.SignatureAlgorithm -} - -func NewRequestSignature( - csrBytes []byte, - cn string, - emails, dnsNames []string, - duration time.Duration, - signatureAlgorithm x509.SignatureAlgorithm, -) *RequestSignature { - return &RequestSignature{ - rawCSRData: csrBytes, - subjectCommonName: cn, - emails: emails, - dnsNames: dnsNames, - duration: duration, - signatureAlgorithm: signatureAlgorithm, - } -} - type CertificateSigned struct { certificate *x509.Certificate } @@ -67,23 +52,8 @@ func (c CertificateSigned) Certificate() *x509.Certificate { return c.certificate } -func (x *X509Signing) Sign(signingRequest *RequestSignature) (*CertificateSigned, error) { - // validate request content - csr, err := x509.ParseCertificateRequest(signingRequest.rawCSRData) - if err != nil { - return nil, fmt.Errorf("could not parse CSR data: %w", err) - } - - certificateFromSigner, err := x.signer.SignCertificate( - NewSignerRequest( - csr, - pkix.Name{CommonName: signingRequest.subjectCommonName}, - signingRequest.emails, - signingRequest.dnsNames, - signingRequest.duration, - signingRequest.signatureAlgorithm, - ), - ) +func (x *X509Signing) Sign(signingRequest *SignerRequest) (*SignerResponse, error) { + certificateFromSigner, err := x.signer.SignCertificate(signingRequest) if err != nil { return nil, fmt.Errorf("could not sign certificate: %w", err) } @@ -93,5 +63,255 @@ func (x *X509Signing) Sign(signingRequest *RequestSignature) (*CertificateSigned return nil, fmt.Errorf("could not store certificate: %w", err) } - return &CertificateSigned{certificate: certificateFromSigner.Certificate}, nil + return certificateFromSigner, nil +} + +type Handler interface { + GetSigner(id string, profile string) (*X509Signing, error) +} + +type ProfileUsage uint8 + +const ( + UsageInvalid ProfileUsage = iota + + UsageOCSP + + UsageClient + UsageCode + UsagePerson + UsageServer + UsageServerClient + + UsageOrgClient + UsageOrgCode + UsageOrgEmail + UsageOrgPerson + UsageOrgServer + UsageOrgServerClient +) + +var profileUsageNames = map[ProfileUsage]string{ + UsageInvalid: "invalid", + + UsageOCSP: "ocsp", + + UsageClient: "client", + UsageCode: "code", + UsagePerson: "person", + UsageServer: "server", + UsageServerClient: "server_client", + + UsageOrgClient: "org_client", + UsageOrgCode: "org_code", + UsageOrgEmail: "org_email", + UsageOrgPerson: "org_person", + UsageOrgServer: "org_server", + UsageOrgServerClient: "org_server_client", +} + +func (p ProfileUsage) String() string { + name, ok := profileUsageNames[p] + if !ok { + return fmt.Sprintf("unknown profile usage %d", p) + } + + return name +} + +var profileUsageDescriptions = map[ProfileUsage]string{ + UsageInvalid: "Invalid certificate profile, not to be used", + + UsageOCSP: "OCSP responder signing certificate", + + UsageClient: "machine TLS client certificate", + UsageCode: "individual code signing certificate", + UsagePerson: "person identity certificate", + UsageServer: "TLS server certificate", + UsageServerClient: "combined TLS server and client certificate", + + UsageOrgClient: "organization machine TLS client certificate", + UsageOrgCode: "organization code signing certificate", + UsageOrgEmail: "organization email certificate", + UsageOrgPerson: "organizational person identity certificate", + UsageOrgServer: "organization TLS server certificate", + UsageOrgServerClient: "combined organization TLS server and client certificate", +} + +func (p ProfileUsage) Description() string { + description, ok := profileUsageDescriptions[p] + if !ok { + return fmt.Sprintf("unknown profile usage %d", p) + } + + return description +} + +type Profile struct { + logger *logrus.Logger + privateKey crypto.Signer + certificate *x509.Certificate + ocspURLs []string + name string + usage ProfileUsage + years int + months int + days int +} + +func (p *Profile) SignCertificate(request *SignerRequest) (*SignerResponse, error) { + signatureAlgorithm, err := p.determineSignatureAlgorithm(request.PreferredHash) + if err != nil { + return nil, err + } + + notBefore := time.Now().UTC() + + serialNumber, err := helper.GenerateRandomSerial() + if err != nil { + return nil, fmt.Errorf("could not generate certificate serial number: %w", err) + } + + const x509v3 = 3 + + template := &x509.Certificate{ + SignatureAlgorithm: signatureAlgorithm, + Version: x509v3, + SerialNumber: serialNumber, + Issuer: p.certificate.Subject, + Subject: request.SubjectDN, + NotBefore: notBefore, + NotAfter: p.setNotAfter(notBefore), + KeyUsage: p.keyUsage(), + ExtKeyUsage: p.extKeyUsage(), + IsCA: false, + OCSPServer: p.ocspURLs, + DNSNames: request.DNSNames, + EmailAddresses: request.Emails, + CRLDistributionPoints: p.certificate.CRLDistributionPoints, + PolicyIdentifiers: p.policyIdentifiers(), + } + + certBytes, err := x509.CreateCertificate(rand.Reader, template, p.certificate, request.CSR.PublicKey, p.privateKey) + if err != nil { + return nil, fmt.Errorf("certificate signing failed: %w", err) + } + + signedCertificate, err := x509.ParseCertificate(certBytes) + if err != nil { + return nil, fmt.Errorf("failed to build certificate from DER data: %w", err) + } + + return &SignerResponse{Certificate: signedCertificate}, nil +} + +func (p *Profile) setNotAfter(before time.Time) time.Time { + return before.AddDate(p.years, p.months, p.days) +} + +func (p *Profile) determineSignatureAlgorithm(hash crypto.Hash) (x509.SignatureAlgorithm, error) { + switch p.certificate.PublicKeyAlgorithm { + case x509.RSA: + switch hash { + case crypto.SHA512: + return x509.SHA512WithRSA, nil + case crypto.SHA384: + return x509.SHA384WithRSA, nil + default: + return x509.SHA256WithRSA, nil + } + case x509.ECDSA: + switch hash { + case crypto.SHA512: + return x509.ECDSAWithSHA512, nil + case crypto.SHA384: + return x509.ECDSAWithSHA384, nil + default: + return x509.ECDSAWithSHA384, nil + } + default: + return x509.UnknownSignatureAlgorithm, fmt.Errorf( + "could not determine signature algorithm for public key algorithm %s", + p.certificate.PublicKeyAlgorithm, + ) + } +} + +func (p *Profile) keyUsage() x509.KeyUsage { + switch p.usage { + case UsageClient, UsagePerson, UsageServer, UsageServerClient, UsageOrgClient, UsageOrgEmail, UsageOrgPerson, + UsageOrgServer, UsageOrgServerClient: + return x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment + default: + return x509.KeyUsageDigitalSignature + } +} + +func (p *Profile) extKeyUsage() []x509.ExtKeyUsage { + switch p.usage { + case UsageClient, UsageOrgClient: + return []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth} + case UsagePerson, UsageOrgPerson: + return []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageEmailProtection} + case UsageOrgEmail: + return []x509.ExtKeyUsage{x509.ExtKeyUsageEmailProtection} + case UsageCode, UsageOrgCode: + return []x509.ExtKeyUsage{x509.ExtKeyUsageCodeSigning} + case UsageServer, UsageOrgServer: + return []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth} + case UsageServerClient, UsageOrgServerClient: + return []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth} + case UsageOCSP: + return []x509.ExtKeyUsage{x509.ExtKeyUsageOCSPSigning} + default: + return nil + } +} + +func (p *Profile) policyIdentifiers() []asn1.ObjectIdentifier { + switch p.usage { + case UsageOCSP: + return nil + default: + return []asn1.ObjectIdentifier{PolicyIdentifierCAcertClass3Policy} + } +} + +func NewProfile( + logger *logrus.Logger, privateKey crypto.Signer, certificate *x509.Certificate, name string, ocspURLs []string, + useFor ProfileUsage, years int, months int, days int, +) *Profile { + return &Profile{ + privateKey: privateKey, + certificate: certificate, + ocspURLs: ocspURLs, + name: name, + usage: useFor, + years: years, + months: months, + days: days, + logger: logger, + } +} + +type SignCertificateHandler struct { + profiles map[string]map[string]*X509Signing +} + +func (s *SignCertificateHandler) GetSigner(issuerID string, profileName string) (*X509Signing, error) { + profiles, ok := s.profiles[issuerID] + if !ok { + return nil, fmt.Errorf("no CA definition found for issuer id %s", issuerID) + } + + profile, ok := profiles[profileName] + if !ok { + return nil, fmt.Errorf("unknown profile %s for issuer %s", profileName, issuerID) + } + + return profile, nil +} + +func NewSignCertificateHandler(profiles map[string]map[string]*X509Signing) *SignCertificateHandler { + return &SignCertificateHandler{profiles: profiles} } diff --git a/internal/x509/signing/signing_test.go b/internal/x509/signing/signing_test.go index 868490c..b217773 100644 --- a/internal/x509/signing/signing_test.go +++ b/internal/x509/signing/signing_test.go @@ -19,6 +19,8 @@ package signing_test import ( "crypto" + "crypto/ecdsa" + "crypto/elliptic" "crypto/rand" "crypto/rsa" "crypto/x509" @@ -45,6 +47,83 @@ func randomSerial(t *testing.T) *big.Int { return serial } +func TestProfileUsage_String(t *testing.T) { + okValues := []struct { + Name string + Usage signing.ProfileUsage + }{ + {"invalid", signing.UsageInvalid}, + {"ocsp", signing.UsageOCSP}, + {"client", signing.UsageClient}, + {"code", signing.UsageCode}, + {"person", signing.UsagePerson}, + {"server", signing.UsageServer}, + {"server-client", signing.UsageServerClient}, + {"org-client", signing.UsageOrgClient}, + {"org-code", signing.UsageOrgCode}, + {"org-email", signing.UsageOrgEmail}, + {"org-person", signing.UsageOrgPerson}, + {"org-server", signing.UsageOrgServer}, + {"org-server-client", signing.UsageOrgServerClient}, + } + + for _, v := range okValues { + t.Run(v.Name, func(t *testing.T) { + str := v.Usage.String() + + assert.NotEmpty(t, str) + assert.NotContains(t, str, "unknown profile usage") + }) + } + + t.Run("undefined", func(t *testing.T) { + str := signing.ProfileUsage(255).String() + + assert.NotEmpty(t, str) + assert.Contains(t, str, "unknown profile usage") + assert.Contains(t, str, "255") + }) +} + +func TestProfileUsage_Description(t *testing.T) { + okValues := []struct { + Name string + Usage signing.ProfileUsage + }{ + {"invalid", signing.UsageInvalid}, + {"ocsp", signing.UsageOCSP}, + {"client", signing.UsageClient}, + {"code", signing.UsageCode}, + {"person", signing.UsagePerson}, + {"server", signing.UsageServer}, + {"server-client", signing.UsageServerClient}, + {"org-client", signing.UsageOrgClient}, + {"org-code", signing.UsageOrgCode}, + {"org-email", signing.UsageOrgEmail}, + {"org-person", signing.UsageOrgPerson}, + {"org-server", signing.UsageOrgServer}, + {"org-server-client", signing.UsageOrgServerClient}, + } + + for _, v := range okValues { + t.Run(v.Name, func(t *testing.T) { + str := v.Usage.Description() + + assert.NotEmpty(t, str) + assert.NotContains(t, str, "unknown profile usage") + assert.Greater(t, len(str), len(v.Name)) + }) + } + + t.Run("undefined", func(t *testing.T) { + str := signing.ProfileUsage(255).Description() + + assert.NotEmpty(t, str) + assert.Contains(t, str, "unknown profile usage") + assert.Contains(t, str, "255") + }) +} + type testRepo struct { certs map[string]x509.Certificate } @@ -72,10 +151,10 @@ func (s *testSigner) SignCertificate(request *signing.SignerRequest) (*signing.S SerialNumber: randomSerial(s.t), EmailAddresses: request.Emails, NotBefore: startDate, - NotAfter: startDate.Add(request.Duration), + NotAfter: startDate.AddDate(1, 0, 0), KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageDataEncipherment, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageEmailProtection}, - SignatureAlgorithm: request.SignatureAlgorithm, + SignatureAlgorithm: s.determineSignatureAlgorithm(request.PreferredHash), } certBytes, err := x509.CreateCertificate(rand.Reader, template, s.certificate, request.CSR.PublicKey, s.key) @@ -91,6 +170,17 @@ func (s *testSigner) SignCertificate(request *signing.SignerRequest) (*signing.S return newTestSignerResponse(certificate), nil } +func (s *testSigner) determineSignatureAlgorithm(hash crypto.Hash) x509.SignatureAlgorithm { + switch hash { + case crypto.SHA512: + return x509.ECDSAWithSHA512 + case crypto.SHA384: + return x509.ECDSAWithSHA384 + default: + return x509.ECDSAWithSHA384 + } +} + func TestSigning(t *testing.T) { testRepository := testRepo{certs: make(map[string]x509.Certificate)} testSigner := newTestSigner(t) @@ -103,26 +193,20 @@ func TestSigning(t *testing.T) { csrTemplate := &x509.CertificateRequest{PublicKey: csrKey.Public()} - csrBytes, err := x509.CreateCertificateRequest(rand.Reader, csrTemplate, csrKey) - if err != nil { - t.Error(err) + testRequest := &signing.SignerRequest{ + CSR: csrTemplate, + SubjectDN: pkix.Name{CommonName: "Test Subject"}, + Emails: []string{"test@example.org"}, + DNSNames: nil, + PreferredHash: crypto.SHA384, } - testRequest := signing.NewRequestSignature( - csrBytes, - "Test Subject", - []string{"test@example.org"}, - nil, - 365*24*time.Hour, - x509.SHA384WithRSA, - ) - signed, err := s.Sign(testRequest) if err != nil { t.Error(err) } - cert := signed.Certificate() + cert := signed.Certificate assert.Contains(t, testRepository.certs, cert.SerialNumber.Text(16)) assert.Equal(t, cert.Subject.CommonName, "Test Subject") assert.Contains(t, cert.EmailAddresses, "test@example.org") @@ -131,7 +215,7 @@ func TestSigning(t *testing.T) { func newTestSigner(t *testing.T) *testSigner { t.Helper() - caKey, err := rsa.GenerateKey(rand.Reader, 3072) + caKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) if err != nil { t.Fatalf("could not generate key pair: %v", err) } diff --git a/pkg/messages/messages.go b/pkg/messages/messages.go index f208c9e..34eba94 100644 --- a/pkg/messages/messages.go +++ b/pkg/messages/messages.go @@ -21,6 +21,7 @@ limitations under the License. package messages import ( + "crypto" "crypto/x509" "encoding/pem" "fmt" @@ -32,6 +33,8 @@ import ( // required for msgpackgen _ "github.com/dave/jennifer" "github.com/google/uuid" + + "git.cacert.org/cacert-gosigner/internal/x509/signing" ) type CommandCode int8 @@ -126,12 +129,23 @@ func BuildResponseAnnounce(code ResponseCode, commandID string) *ResponseAnnounc return &ResponseAnnounce{Code: code, ID: commandID, Created: time.Now().UTC()} } -type HealthCommand struct{} +type CAProfile struct { + Name string `msgpack:"name"` + Description string `msgpack:"description"` + UseFor signing.ProfileUsage `msgpack:"use-for"` +} -func (h *HealthCommand) String() string { - return "" +func (p CAProfile) String() string { + return fmt.Sprintf("profile['%s': '%s']", p.Name, p.UseFor) } +type CertificateStatus string + +const ( + CertStatusOk CertificateStatus = "ok" + CertStatusFailed CertificateStatus = "failed" +) + type CAInfoCommand struct { Name string `msgpack:"name"` } @@ -140,6 +154,25 @@ func (r *CAInfoCommand) String() string { return fmt.Sprintf("name=%s", r.Name) } +type CAInfoResponse struct { + Name string `msgpack:"name"` + Certificate []byte `msgpack:"certificate"` + Signing bool `msgpack:"signing"` + Profiles []CAProfile `msgpack:"profiles"` +} + +func (i CAInfoResponse) String() string { + return fmt.Sprintf("certificate name=%s, signing=%t, profiles=[%s]", i.Name, i.Signing, i.Profiles) +} + +type ErrorResponse struct { + Message string `msgpack:"message"` +} + +func (e *ErrorResponse) String() string { + return fmt.Sprintf("message=%s", e.Message) +} + type FetchCRLCommand struct { IssuerID string `msgpack:"issuer_id"` LastKnownID []byte `msgpack:"last_known_id"` @@ -157,121 +190,64 @@ func (f *FetchCRLCommand) String() string { return builder.String() } -type ProfileUsage uint8 - -const ( - UsageInvalid ProfileUsage = iota - - UsageOCSP - - UsageClient - UsageCode - UsagePerson - UsageServer - UsageServerClient - - UsageOrgClient - UsageOrgCode - UsageOrgEmail - UsageOrgPerson - UsageOrgServer - UsageOrgServerClient -) - -var validProfileUsages = map[string]ProfileUsage{ - "ocsp": UsageOCSP, - - "client": UsageClient, - "code": UsageCode, - "person": UsagePerson, - "server": UsageServer, - "server_client": UsageServerClient, - - "org_client": UsageOrgClient, - "org_code": UsageOrgCode, - "org_email": UsageOrgEmail, - "org_person": UsageOrgPerson, - "org_server": UsageOrgServer, - "org_server_client": UsageOrgServerClient, +type FetchCRLResponse struct { + IssuerID string `msgpack:"issuer_id"` + IsDelta bool `msgpack:"is_delta"` + UnChanged bool `msgpack:"unchanged"` + CRLData []byte `msgpack:"crl_data"` + CRLNumber []byte `msgpack:"crl_number"` } -var profileUsageDetails = map[ProfileUsage]struct { - Name string - Description string -}{ - UsageInvalid: {"invalid", "Invalid certificate profile, not to be used"}, - - UsageOCSP: {"ocsp", "OCSP responder signing certificate"}, - - UsageClient: {"client", "machine TLS client certificate"}, - UsageCode: {"code", "individual code signing certificate"}, - UsagePerson: {"person", "person identity certificate"}, - UsageServer: {"server", "TLS server certificate"}, - UsageServerClient: {"server_client", "combined TLS server and client certificate"}, - - UsageOrgClient: {"org_client", "organization machine TLS client certificate"}, - UsageOrgCode: {"org_code", "organization code signing certificate"}, - UsageOrgEmail: {"org_email", "organization email certificate"}, - UsageOrgPerson: {"org_person", "organizational person identity certificate"}, - UsageOrgServer: {"org_server", "organization TLS server certificate"}, - UsageOrgServerClient: { - "org_server_client", - "combined organization TLS server and client certificate", - }, -} +func (r *FetchCRLResponse) String() string { + builder := &strings.Builder{} -func (p ProfileUsage) String() string { - name, ok := profileUsageDetails[p] - if !ok { - return fmt.Sprintf("unknown profile usage %d", p) + _, _ = fmt.Fprintf( + builder, + "issuer id=%s, delta=%t, unchanged=%t, CRL number=0x%x", + r.IssuerID, + r.IsDelta, + r.UnChanged, + new(big.Int).SetBytes(r.CRLNumber), + ) + + if r.UnChanged { + return builder.String() } - return name.Name -} + if r.IsDelta { + _, _ = fmt.Fprintf(builder, ", delta CRL data of %d bytes not shown", len(r.CRLData)) -func (p ProfileUsage) Description() string { - name, ok := profileUsageDetails[p] - if !ok { - return fmt.Sprintf("unknown profile usage %d", p) + return builder.String() } - return name.Description -} + revocationList, err := x509.ParseRevocationList(r.CRLData) + if err != nil { + _, _ = fmt.Fprintf(builder, ", could not parse CRL: %s", err.Error()) -func ParseUsage(u string) (ProfileUsage, error) { - usage, ok := validProfileUsages[u] - if !ok { - return UsageInvalid, fmt.Errorf("unsupported profile usage: %s", u) + return builder.String() } - return usage, nil -} - -type CAProfile struct { - Name string `msgpack:"name"` - UseFor ProfileUsage `msgpack:"use-for"` -} + _, _ = fmt.Fprintf( + builder, + ", CRL info: issuer=%s, number=0x%x, next update=%s, revoked certificates=%d", + revocationList.Issuer, + revocationList.Number, + revocationList.NextUpdate, + len(revocationList.RevokedCertificates), + ) + _, _ = builder.WriteString(", CRL data:\n") + _ = pem.Encode(builder, &pem.Block{ + Type: "CERTIFICATE REVOCATION LIST", + Bytes: r.CRLData, + }) -func (p CAProfile) String() string { - return fmt.Sprintf("profile['%s': '%s']", p.Name, p.UseFor) + return builder.String() } -type CertificateStatus string - -const ( - CertStatusOk CertificateStatus = "ok" - CertStatusFailed CertificateStatus = "failed" -) - -type CAInfoResponse struct { - Name string `msgpack:"name"` - Certificate []byte `msgpack:"certificate"` - Signing bool `msgpack:"signing"` - Profiles []CAProfile `msgpack:"profiles,omitempty"` -} +type HealthCommand struct{} -func (i CAInfoResponse) String() string { - return fmt.Sprintf("certificate name=%s, signing=%t, profiles=[%s]", i.Name, i.Signing, i.Profiles) +func (h *HealthCommand) String() string { + return "" } type HealthInfo struct { @@ -331,64 +307,56 @@ func (h *HealthResponse) String() string { return builder.String() } -type FetchCRLResponse struct { - IssuerID string `msgpack:"issuer_id"` - IsDelta bool `msgpack:"is_delta"` - UnChanged bool `msgpack:"unchanged"` - CRLData []byte `msgpack:"crl_data"` - CRLNumber []byte `msgpack:"crl_number"` +type SignCertificateCommand struct { + IssuerID string `msgpack:"issuer_id"` + ProfileName string `msgpack:"profile_name"` + CSRData []byte `msgpack:"csr_data"` + CommonName string `msgpack:"cn"` + Organization string `msgpack:"o"` + OrganizationalUnit string `msgpack:"ou"` + Hostnames []string `msgpack:"hostnames"` + EmailAddresses []string `msgpack:"email_addresses"` + PreferredHash crypto.Hash `msgpack:"preferred_hash"` } -func (r *FetchCRLResponse) String() string { +func (s *SignCertificateCommand) String() string { builder := &strings.Builder{} _, _ = fmt.Fprintf( - builder, - "issuer id=%s, delta=%t, unchanged=%t, CRL number=0x%x", - r.IssuerID, - r.IsDelta, - r.UnChanged, - new(big.Int).SetBytes(r.CRLNumber), + builder, "issuer_id=%s, profile_name=%s, cn=%s", s.IssuerID, s.ProfileName, s.CommonName, ) - if r.UnChanged { - return builder.String() + if s.Organization != "" { + _, _ = fmt.Fprintf(builder, ", o=%s", s.Organization) } - if r.IsDelta { - _, _ = fmt.Fprintf(builder, ", delta CRL data of %d bytes not shown", len(r.CRLData)) - - return builder.String() + if s.OrganizationalUnit != "" { + _, _ = fmt.Fprintf(builder, ", ou=%s", s.OrganizationalUnit) } - revocationList, err := x509.ParseRevocationList(r.CRLData) - if err != nil { - _, _ = fmt.Fprintf(builder, ", could not parse CRL: %s", err.Error()) + if len(s.Hostnames) > 0 { + builder.WriteString(", hostnames=[") - return builder.String() + builder.WriteString(strings.Join(s.Hostnames, ", ")) + + builder.WriteRune(']') } - _, _ = fmt.Fprintf( - builder, - ", CRL info: issuer=%s, number=0x%x, next update=%s, revoked certificates=%d", - revocationList.Issuer, - revocationList.Number, - revocationList.NextUpdate, - len(revocationList.RevokedCertificates), - ) - _, _ = builder.WriteString(", CRL data:\n") - _ = pem.Encode(builder, &pem.Block{ - Type: "CERTIFICATE REVOCATION LIST", - Bytes: r.CRLData, - }) + if len(s.EmailAddresses) > 0 { + builder.WriteString(", email_addresses=[") + + builder.WriteString(strings.Join(s.Hostnames, ", ")) + + builder.WriteRune(']') + } return builder.String() } -type ErrorResponse struct { - Message string `msgpack:"message"` +type SignCertificateResponse struct { + CertificateData []byte `msgpack:"cert_data"` } -func (e *ErrorResponse) String() string { - return fmt.Sprintf("message=%s", e.Message) +func (r *SignCertificateResponse) String() string { + return fmt.Sprintf("cert_data of %d bytes", len(r.CertificateData)) } diff --git a/pkg/messages/messages_it_test.go b/pkg/messages/messages_it_test.go index d87d871..5d16f2a 100644 --- a/pkg/messages/messages_it_test.go +++ b/pkg/messages/messages_it_test.go @@ -28,32 +28,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "git.cacert.org/cacert-gosigner/internal/x509/signing" "git.cacert.org/cacert-gosigner/pkg/messages" ) -func TestParseUsage(t *testing.T) { - okValues := []string{ - "ocsp", "client", "code", "person", "server", "server_client", - "org_client", "org_code", "org_email", "org_person", "org_server", "org_server_client", - } - - for _, v := range okValues { - t.Run(v, func(t *testing.T) { - u, err := messages.ParseUsage(v) - - assert.NoError(t, err) - assert.Greater(t, u, messages.ProfileUsage(0)) - }) - } - - t.Run("invalid", func(t *testing.T) { - u, err := messages.ParseUsage("foo") - - assert.Error(t, err) - assert.Equal(t, u, messages.UsageInvalid) - }) -} - func TestBuildCommandAnnounce(t *testing.T) { commands := []messages.CommandCode{ messages.CmdUndef, @@ -159,7 +137,7 @@ func TestMsgPackSerialization(t *testing.T) { Profiles: []messages.CAProfile{ { Name: "client", - UseFor: messages.UsageClient, + UseFor: signing.UsageClient, }, }, }, diff --git a/pkg/messages/messages_test.go b/pkg/messages/messages_test.go index 0490ade..562399e 100644 --- a/pkg/messages/messages_test.go +++ b/pkg/messages/messages_test.go @@ -33,6 +33,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "git.cacert.org/cacert-gosigner/internal/x509/signing" ) func TestCommandCode_String(t *testing.T) { @@ -153,97 +155,20 @@ func TestFetchCRLCommand_String(t *testing.T) { }) } -func TestProfileUsage_String(t *testing.T) { - okValues := []struct { - Name string - Usage ProfileUsage - }{ - {"invalid", UsageInvalid}, - {"ocsp", UsageOCSP}, - {"client", UsageClient}, - {"code", UsageCode}, - {"person", UsagePerson}, - {"server", UsageServer}, - {"server-client", UsageServerClient}, - {"org-client", UsageOrgClient}, - {"org-code", UsageOrgCode}, - {"org-email", UsageOrgEmail}, - {"org-person", UsageOrgPerson}, - {"org-server", UsageOrgServer}, - {"org-server-client", UsageOrgServerClient}, - } - - for _, v := range okValues { - t.Run(v.Name, func(t *testing.T) { - str := v.Usage.String() - - assert.NotEmpty(t, str) - assert.NotContains(t, str, "unknown profile usage") - }) - } - - t.Run("undefined", func(t *testing.T) { - str := ProfileUsage(255).String() - - assert.NotEmpty(t, str) - assert.Contains(t, str, "unknown profile usage") - assert.Contains(t, str, "255") - }) -} - -func TestProfileUsage_Description(t *testing.T) { - okValues := []struct { - Name string - Usage ProfileUsage - }{ - {"invalid", UsageInvalid}, - {"ocsp", UsageOCSP}, - {"client", UsageClient}, - {"code", UsageCode}, - {"person", UsagePerson}, - {"server", UsageServer}, - {"server-client", UsageServerClient}, - {"org-client", UsageOrgClient}, - {"org-code", UsageOrgCode}, - {"org-email", UsageOrgEmail}, - {"org-person", UsageOrgPerson}, - {"org-server", UsageOrgServer}, - {"org-server-client", UsageOrgServerClient}, - } - - for _, v := range okValues { - t.Run(v.Name, func(t *testing.T) { - str := v.Usage.Description() - - assert.NotEmpty(t, str) - assert.NotContains(t, str, "unknown profile usage") - assert.Greater(t, len(str), len(v.Name)) - }) - } - - t.Run("undefined", func(t *testing.T) { - str := ProfileUsage(255).Description() - - assert.NotEmpty(t, str) - assert.Contains(t, str, "unknown profile usage") - assert.Contains(t, str, "255") - }) -} - func TestCAProfile_String(t *testing.T) { profiles := []CAProfile{ - {Name: "test-client", UseFor: UsageClient}, - {Name: "test-code", UseFor: UsageCode}, - {Name: "test-ocsp", UseFor: UsageOCSP}, - {Name: "test-org-client", UseFor: UsageOrgClient}, - {Name: "test-org-code", UseFor: UsageOrgCode}, - {Name: "test-org-email", UseFor: UsageOrgEmail}, - {Name: "test-org-person", UseFor: UsageOrgPerson}, - {Name: "test-org-server", UseFor: UsageOrgServer}, - {Name: "test-org-server-client", UseFor: UsageOrgServerClient}, - {Name: "test-person", UseFor: UsagePerson}, - {Name: "test-server", UseFor: UsageServer}, - {Name: "test-server-client", UseFor: UsageServerClient}, + {Name: "test-client", UseFor: signing.UsageClient}, + {Name: "test-code", UseFor: signing.UsageCode}, + {Name: "test-ocsp", UseFor: signing.UsageOCSP}, + {Name: "test-org-client", UseFor: signing.UsageOrgClient}, + {Name: "test-org-code", UseFor: signing.UsageOrgCode}, + {Name: "test-org-email", UseFor: signing.UsageOrgEmail}, + {Name: "test-org-person", UseFor: signing.UsageOrgPerson}, + {Name: "test-org-server", UseFor: signing.UsageOrgServer}, + {Name: "test-org-server-client", UseFor: signing.UsageOrgServerClient}, + {Name: "test-person", UseFor: signing.UsagePerson}, + {Name: "test-server", UseFor: signing.UsageServer}, + {Name: "test-server-client", UseFor: signing.UsageServerClient}, } for _, p := range profiles { @@ -278,7 +203,7 @@ func TestCAInfoResponse_String(t *testing.T) { Signing: true, Profiles: []CAProfile{{ Name: "test", - UseFor: UsageServer, + UseFor: signing.UsageServer, }}, Certificate: certBytes, } diff --git a/pkg/messages/resolver.msgpackgen.go b/pkg/messages/resolver.msgpackgen.go index 068705c..c9c37e5 100644 --- a/pkg/messages/resolver.msgpackgen.go +++ b/pkg/messages/resolver.msgpackgen.go @@ -26,64 +26,64 @@ func ___encode(i interface{}) ([]byte, error) { // encodeAsArray func ___encodeAsArray(i interface{}) ([]byte, error) { switch v := i.(type) { - case HealthCommand: + case CAInfoCommand: encoder := enc.NewEncoder() - size, err := ___calcArraySizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcArraySizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "CAInfoCommand", size, offset) } return b, err - case *HealthCommand: + case *CAInfoCommand: encoder := enc.NewEncoder() - size, err := ___calcArraySizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcArraySizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "CAInfoCommand", size, offset) } return b, err - case CAInfoCommand: + case ErrorResponse: encoder := enc.NewEncoder() - size, err := ___calcArraySizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcArraySizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "CAInfoCommand", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) } return b, err - case *CAInfoCommand: + case *ErrorResponse: encoder := enc.NewEncoder() - size, err := ___calcArraySizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcArraySizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "CAInfoCommand", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) } return b, err case FetchCRLCommand: @@ -116,163 +116,163 @@ func ___encodeAsArray(i interface{}) ([]byte, error) { return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLCommand", size, offset) } return b, err - case HealthInfo: + case FetchCRLResponse: encoder := enc.NewEncoder() - size, err := ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcArraySizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) } return b, err - case *HealthInfo: + case *FetchCRLResponse: encoder := enc.NewEncoder() - size, err := ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcArraySizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) } return b, err - case HealthResponse: + case HealthCommand: encoder := enc.NewEncoder() - size, err := ___calcArraySizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcArraySizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) } return b, err - case *HealthResponse: + case *HealthCommand: encoder := enc.NewEncoder() - size, err := ___calcArraySizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcArraySizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) } return b, err - case FetchCRLResponse: + case HealthInfo: encoder := enc.NewEncoder() - size, err := ___calcArraySizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) } return b, err - case *FetchCRLResponse: + case *HealthInfo: encoder := enc.NewEncoder() - size, err := ___calcArraySizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) } return b, err - case ErrorResponse: + case HealthResponse: encoder := enc.NewEncoder() - size, err := ___calcArraySizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcArraySizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) } return b, err - case *ErrorResponse: + case *HealthResponse: encoder := enc.NewEncoder() - size, err := ___calcArraySizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcArraySizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) } return b, err - } - return nil, nil -} - -// encodeAsMap -func ___encodeAsMap(i interface{}) ([]byte, error) { - switch v := i.(type) { - case HealthCommand: + case SignCertificateResponse: encoder := enc.NewEncoder() - size, err := ___calcMapSizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcArraySizeSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeArraySignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "SignCertificateResponse", size, offset) } return b, err - case *HealthCommand: + case *SignCertificateResponse: encoder := enc.NewEncoder() - size, err := ___calcMapSizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcArraySizeSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeArraySignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "SignCertificateResponse", size, offset) } return b, err + } + return nil, nil +} + +// encodeAsMap +func ___encodeAsMap(i interface{}) ([]byte, error) { + switch v := i.(type) { case CAInfoCommand: encoder := enc.NewEncoder() size, err := ___calcMapSizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) @@ -303,6 +303,36 @@ func ___encodeAsMap(i interface{}) ([]byte, error) { return nil, fmt.Errorf("%s size / offset different %d : %d", "CAInfoCommand", size, offset) } return b, err + case ErrorResponse: + encoder := enc.NewEncoder() + size, err := ___calcMapSizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + if err != nil { + return nil, err + } + encoder.MakeBytes(size) + b, offset, err := ___encodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + if err != nil { + return nil, err + } + if size != offset { + return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) + } + return b, err + case *ErrorResponse: + encoder := enc.NewEncoder() + size, err := ___calcMapSizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + if err != nil { + return nil, err + } + encoder.MakeBytes(size) + b, offset, err := ___encodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + if err != nil { + return nil, err + } + if size != offset { + return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) + } + return b, err case FetchCRLCommand: encoder := enc.NewEncoder() size, err := ___calcMapSizeFetchCRLCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) @@ -333,124 +363,154 @@ func ___encodeAsMap(i interface{}) ([]byte, error) { return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLCommand", size, offset) } return b, err - case HealthInfo: + case FetchCRLResponse: encoder := enc.NewEncoder() - size, err := ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcMapSizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) } return b, err - case *HealthInfo: + case *FetchCRLResponse: encoder := enc.NewEncoder() - size, err := ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcMapSizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) } return b, err - case HealthResponse: + case HealthCommand: encoder := enc.NewEncoder() - size, err := ___calcMapSizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcMapSizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) } return b, err - case *HealthResponse: + case *HealthCommand: encoder := enc.NewEncoder() - size, err := ___calcMapSizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcMapSizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthCommand", size, offset) } return b, err - case FetchCRLResponse: + case HealthInfo: encoder := enc.NewEncoder() - size, err := ___calcMapSizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) } return b, err - case *FetchCRLResponse: + case *HealthInfo: encoder := enc.NewEncoder() - size, err := ___calcMapSizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "FetchCRLResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthInfo", size, offset) } return b, err - case ErrorResponse: + case HealthResponse: encoder := enc.NewEncoder() - size, err := ___calcMapSizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + size, err := ___calcMapSizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + b, offset, err := ___encodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) } return b, err - case *ErrorResponse: + case *HealthResponse: encoder := enc.NewEncoder() - size, err := ___calcMapSizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + size, err := ___calcMapSizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) if err != nil { return nil, err } encoder.MakeBytes(size) - b, offset, err := ___encodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + b, offset, err := ___encodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) if err != nil { return nil, err } if size != offset { - return nil, fmt.Errorf("%s size / offset different %d : %d", "ErrorResponse", size, offset) + return nil, fmt.Errorf("%s size / offset different %d : %d", "HealthResponse", size, offset) + } + return b, err + case SignCertificateResponse: + encoder := enc.NewEncoder() + size, err := ___calcMapSizeSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder) + if err != nil { + return nil, err + } + encoder.MakeBytes(size) + b, offset, err := ___encodeMapSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, encoder, 0) + if err != nil { + return nil, err + } + if size != offset { + return nil, fmt.Errorf("%s size / offset different %d : %d", "SignCertificateResponse", size, offset) + } + return b, err + case *SignCertificateResponse: + encoder := enc.NewEncoder() + size, err := ___calcMapSizeSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder) + if err != nil { + return nil, err + } + encoder.MakeBytes(size) + b, offset, err := ___encodeMapSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, encoder, 0) + if err != nil { + return nil, err + } + if size != offset { + return nil, fmt.Errorf("%s size / offset different %d : %d", "SignCertificateResponse", size, offset) } return b, err } @@ -469,30 +529,30 @@ func ___decode(data []byte, i interface{}) (bool, error) { // decodeAsArray func ___decodeAsArray(data []byte, i interface{}) (bool, error) { switch v := i.(type) { - case *HealthCommand: + case *CAInfoCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **HealthCommand: + case **CAInfoCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *CAInfoCommand: + case *ErrorResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **CAInfoCommand: + case **ErrorResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } @@ -511,58 +571,72 @@ func ___decodeAsArray(data []byte, i interface{}) (bool, error) { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *HealthInfo: + case *FetchCRLResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **HealthInfo: + case **FetchCRLResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *HealthResponse: + case *HealthCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **HealthResponse: + case **HealthCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *FetchCRLResponse: + case *HealthInfo: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **FetchCRLResponse: + case **HealthInfo: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *ErrorResponse: + case *HealthResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **ErrorResponse: + case **HealthResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + if err == nil && offset != decoder.Len() { + return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) + } + return true, err + case *SignCertificateResponse: + decoder := dec.NewDecoder(data) + offset, err := ___decodeArraySignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + if err == nil && offset != decoder.Len() { + return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) + } + return true, err + case **SignCertificateResponse: + decoder := dec.NewDecoder(data) + offset, err := ___decodeArraySignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } @@ -574,30 +648,30 @@ func ___decodeAsArray(data []byte, i interface{}) (bool, error) { // decodeAsMap func ___decodeAsMap(data []byte, i interface{}) (bool, error) { switch v := i.(type) { - case *HealthCommand: + case *CAInfoCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **HealthCommand: + case **CAInfoCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *CAInfoCommand: + case *ErrorResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **CAInfoCommand: + case **ErrorResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } @@ -616,58 +690,72 @@ func ___decodeAsMap(data []byte, i interface{}) (bool, error) { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *HealthInfo: + case *FetchCRLResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **HealthInfo: + case **FetchCRLResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *HealthResponse: + case *HealthCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **HealthResponse: + case **HealthCommand: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *FetchCRLResponse: + case *HealthInfo: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **FetchCRLResponse: + case **HealthInfo: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case *ErrorResponse: + case *HealthResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + offset, err := ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } return true, err - case **ErrorResponse: + case **HealthResponse: decoder := dec.NewDecoder(data) - offset, err := ___decodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + offset, err := ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) + if err == nil && offset != decoder.Len() { + return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) + } + return true, err + case *SignCertificateResponse: + decoder := dec.NewDecoder(data) + offset, err := ___decodeMapSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v, decoder, 0) + if err == nil && offset != decoder.Len() { + return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) + } + return true, err + case **SignCertificateResponse: + decoder := dec.NewDecoder(data) + offset, err := ___decodeMapSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(*v, decoder, 0) if err == nil && offset != decoder.Len() { return true, fmt.Errorf("read length is different [%d] [%d] ", offset, decoder.Len()) } @@ -676,52 +764,68 @@ func ___decodeAsMap(data []byte, i interface{}) (bool, error) { return false, nil } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand -func ___calcArraySizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand +func ___calcArraySizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder) (int, error) { size := 0 - size += encoder.CalcStructHeaderFix(0) + size += encoder.CalcStructHeaderFix(1) + size += encoder.CalcString(v.Name) return size, nil } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand -func ___calcMapSizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand +func ___calcMapSizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder) (int, error) { size := 0 - size += encoder.CalcStructHeaderFix(0) + size += encoder.CalcStructHeaderFix(1) + size += encoder.CalcStringFix(4) + size += encoder.CalcString(v.Name) return size, nil } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand -func ___encodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand +func ___encodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error - offset = encoder.WriteStructHeaderFixAsArray(0, offset) + offset = encoder.WriteStructHeaderFixAsArray(1, offset) + offset = encoder.WriteString(v.Name, offset) return encoder.EncodedBytes(), offset, err } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand -func ___encodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand +func ___encodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error - offset = encoder.WriteStructHeaderFixAsMap(0, offset) + offset = encoder.WriteStructHeaderFixAsMap(1, offset) + offset = encoder.WriteStringFix("name", 4, offset) + offset = encoder.WriteString(v.Name, offset) return encoder.EncodedBytes(), offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand -func ___decodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthCommand, decoder *dec.Decoder, offset int) (int, error) { - offset, err := decoder.CheckStructHeader(0, offset) +// decode to git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand +func ___decodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *CAInfoCommand, decoder *dec.Decoder, offset int) (int, error) { + offset, err := decoder.CheckStructHeader(1, offset) if err != nil { return 0, err } + { + var vv string + vv, offset, err = decoder.AsString(offset) + if err != nil { + return 0, err + } + v.Name = vv + } return offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand -func ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthCommand, decoder *dec.Decoder, offset int) (int, error) { - keys := [][]byte{} - offset, err := decoder.CheckStructHeader(0, offset) +// decode to git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand +func ___decodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *CAInfoCommand, decoder *dec.Decoder, offset int) (int, error) { + keys := [][]byte{ + {uint8(0x6e), uint8(0x61), uint8(0x6d), uint8(0x65)}, // name + } + offset, err := decoder.CheckStructHeader(1, offset) if err != nil { return 0, err } count := 0 - for count < 0 { + for count < 1 { var dataKey []byte dataKey, offset, err = decoder.AsStringBytes(offset) if err != nil { @@ -744,6 +848,16 @@ func ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f8 } } switch fieldIndex { + case 0: + { + var vv string + vv, offset, err = decoder.AsString(offset) + if err != nil { + return 0, err + } + v.Name = vv + } + count++ default: return 0, fmt.Errorf("unknown key[%s] found", string(dataKey)) } @@ -751,42 +865,42 @@ func ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f8 return offset, err } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand -func ___calcArraySizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse +func ___calcArraySizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder) (int, error) { size := 0 size += encoder.CalcStructHeaderFix(1) - size += encoder.CalcString(v.Name) + size += encoder.CalcString(v.Message) return size, nil } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand -func ___calcMapSizeCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse +func ___calcMapSizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder) (int, error) { size := 0 size += encoder.CalcStructHeaderFix(1) - size += encoder.CalcStringFix(4) - size += encoder.CalcString(v.Name) + size += encoder.CalcStringFix(7) + size += encoder.CalcString(v.Message) return size, nil } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand -func ___encodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse +func ___encodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error offset = encoder.WriteStructHeaderFixAsArray(1, offset) - offset = encoder.WriteString(v.Name, offset) + offset = encoder.WriteString(v.Message, offset) return encoder.EncodedBytes(), offset, err } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand -func ___encodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v CAInfoCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse +func ___encodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error offset = encoder.WriteStructHeaderFixAsMap(1, offset) - offset = encoder.WriteStringFix("name", 4, offset) - offset = encoder.WriteString(v.Name, offset) + offset = encoder.WriteStringFix("message", 7, offset) + offset = encoder.WriteString(v.Message, offset) return encoder.EncodedBytes(), offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand -func ___decodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *CAInfoCommand, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse +func ___decodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *ErrorResponse, decoder *dec.Decoder, offset int) (int, error) { offset, err := decoder.CheckStructHeader(1, offset) if err != nil { return 0, err @@ -797,15 +911,15 @@ func ___decodeArrayCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377 if err != nil { return 0, err } - v.Name = vv + v.Message = vv } return offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.CAInfoCommand -func ___decodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *CAInfoCommand, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse +func ___decodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *ErrorResponse, decoder *dec.Decoder, offset int) (int, error) { keys := [][]byte{ - {uint8(0x6e), uint8(0x61), uint8(0x6d), uint8(0x65)}, // name + {uint8(0x6d), uint8(0x65), uint8(0x73), uint8(0x73), uint8(0x61), uint8(0x67), uint8(0x65)}, // message } offset, err := decoder.CheckStructHeader(1, offset) if err != nil { @@ -842,7 +956,7 @@ func ___decodeMapCAInfoCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f8 if err != nil { return 0, err } - v.Name = vv + v.Message = vv } count++ default: @@ -1038,46 +1152,33 @@ func ___decodeMapFetchCRLCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377 return offset, err } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo -func ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse +func ___calcArraySizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder) (int, error) { size := 0 - size += encoder.CalcStructHeaderFix(3) - size += encoder.CalcString(v.Source) - size += encoder.CalcBool(v.Healthy) - if v.MoreInfo != nil { - s, err := encoder.CalcMapLength(len(v.MoreInfo)) + size += encoder.CalcStructHeaderFix(5) + size += encoder.CalcString(v.IssuerID) + size += encoder.CalcBool(v.IsDelta) + size += encoder.CalcBool(v.UnChanged) + if v.CRLData != nil { + s, err := encoder.CalcSliceLength(len(v.CRLData), true) if err != nil { return 0, err } size += s - for kk, vv := range v.MoreInfo { - size += encoder.CalcString(kk) - size += encoder.CalcString(vv) + for _, vv := range v.CRLData { + size += encoder.CalcByte(vv) } } else { size += encoder.CalcNil() } - return size, nil -} - -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo -func ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder) (int, error) { - size := 0 - size += encoder.CalcStructHeaderFix(3) - size += encoder.CalcStringFix(6) - size += encoder.CalcString(v.Source) - size += encoder.CalcStringFix(7) - size += encoder.CalcBool(v.Healthy) - size += encoder.CalcStringFix(8) - if v.MoreInfo != nil { - s, err := encoder.CalcMapLength(len(v.MoreInfo)) + if v.CRLNumber != nil { + s, err := encoder.CalcSliceLength(len(v.CRLNumber), true) if err != nil { return 0, err } size += s - for kk, vv := range v.MoreInfo { - size += encoder.CalcString(kk) - size += encoder.CalcString(vv) + for _, vv := range v.CRLNumber { + size += encoder.CalcByte(vv) } } else { size += encoder.CalcNil() @@ -1085,38 +1186,95 @@ func ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81 return size, nil } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo -func ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder, offset int) ([]byte, int, error) { - var err error - offset = encoder.WriteStructHeaderFixAsArray(3, offset) - offset = encoder.WriteString(v.Source, offset) - offset = encoder.WriteBool(v.Healthy, offset) - if v.MoreInfo != nil { - offset = encoder.WriteMapLength(len(v.MoreInfo), offset) - for kk, vv := range v.MoreInfo { - offset = encoder.WriteString(kk, offset) - offset = encoder.WriteString(vv, offset) - } - } else { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse +func ___calcMapSizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder) (int, error) { + size := 0 + size += encoder.CalcStructHeaderFix(5) + size += encoder.CalcStringFix(9) + size += encoder.CalcString(v.IssuerID) + size += encoder.CalcStringFix(8) + size += encoder.CalcBool(v.IsDelta) + size += encoder.CalcStringFix(9) + size += encoder.CalcBool(v.UnChanged) + size += encoder.CalcStringFix(8) + if v.CRLData != nil { + s, err := encoder.CalcSliceLength(len(v.CRLData), true) + if err != nil { + return 0, err + } + size += s + for _, vv := range v.CRLData { + size += encoder.CalcByte(vv) + } + } else { + size += encoder.CalcNil() + } + size += encoder.CalcStringFix(10) + if v.CRLNumber != nil { + s, err := encoder.CalcSliceLength(len(v.CRLNumber), true) + if err != nil { + return 0, err + } + size += s + for _, vv := range v.CRLNumber { + size += encoder.CalcByte(vv) + } + } else { + size += encoder.CalcNil() + } + return size, nil +} + +// encode from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse +func ___encodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { + var err error + offset = encoder.WriteStructHeaderFixAsArray(5, offset) + offset = encoder.WriteString(v.IssuerID, offset) + offset = encoder.WriteBool(v.IsDelta, offset) + offset = encoder.WriteBool(v.UnChanged, offset) + if v.CRLData != nil { + offset = encoder.WriteSliceLength(len(v.CRLData), offset, true) + for _, vv := range v.CRLData { + offset = encoder.WriteByte(vv, offset) + } + } else { + offset = encoder.WriteNil(offset) + } + if v.CRLNumber != nil { + offset = encoder.WriteSliceLength(len(v.CRLNumber), offset, true) + for _, vv := range v.CRLNumber { + offset = encoder.WriteByte(vv, offset) + } + } else { offset = encoder.WriteNil(offset) } return encoder.EncodedBytes(), offset, err } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo -func ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse +func ___encodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error - offset = encoder.WriteStructHeaderFixAsMap(3, offset) - offset = encoder.WriteStringFix("Source", 6, offset) - offset = encoder.WriteString(v.Source, offset) - offset = encoder.WriteStringFix("Healthy", 7, offset) - offset = encoder.WriteBool(v.Healthy, offset) - offset = encoder.WriteStringFix("MoreInfo", 8, offset) - if v.MoreInfo != nil { - offset = encoder.WriteMapLength(len(v.MoreInfo), offset) - for kk, vv := range v.MoreInfo { - offset = encoder.WriteString(kk, offset) - offset = encoder.WriteString(vv, offset) + offset = encoder.WriteStructHeaderFixAsMap(5, offset) + offset = encoder.WriteStringFix("issuer_id", 9, offset) + offset = encoder.WriteString(v.IssuerID, offset) + offset = encoder.WriteStringFix("is_delta", 8, offset) + offset = encoder.WriteBool(v.IsDelta, offset) + offset = encoder.WriteStringFix("unchanged", 9, offset) + offset = encoder.WriteBool(v.UnChanged, offset) + offset = encoder.WriteStringFix("crl_data", 8, offset) + if v.CRLData != nil { + offset = encoder.WriteSliceLength(len(v.CRLData), offset, true) + for _, vv := range v.CRLData { + offset = encoder.WriteByte(vv, offset) + } + } else { + offset = encoder.WriteNil(offset) + } + offset = encoder.WriteStringFix("crl_number", 10, offset) + if v.CRLNumber != nil { + offset = encoder.WriteSliceLength(len(v.CRLNumber), offset, true) + for _, vv := range v.CRLNumber { + offset = encoder.WriteByte(vv, offset) } } else { offset = encoder.WriteNil(offset) @@ -1124,9 +1282,9 @@ func ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5 return encoder.EncodedBytes(), offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo -func ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthInfo, decoder *dec.Decoder, offset int) (int, error) { - offset, err := decoder.CheckStructHeader(3, offset) +// decode to git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse +func ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *FetchCRLResponse, decoder *dec.Decoder, offset int) (int, error) { + offset, err := decoder.CheckStructHeader(5, offset) if err != nil { return 0, err } @@ -1136,7 +1294,7 @@ func ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81 if err != nil { return 0, err } - v.Source = vv + v.IssuerID = vv } { var vv bool @@ -1144,49 +1302,74 @@ func ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81 if err != nil { return 0, err } - v.Healthy = vv + v.IsDelta = vv + } + { + var vv bool + vv, offset, err = decoder.AsBool(offset) + if err != nil { + return 0, err + } + v.UnChanged = vv } if !decoder.IsCodeNil(offset) { - var vv map[string]string + var vv []byte var vvl int - vvl, offset, err = decoder.MapLength(offset) + vvl, offset, err = decoder.SliceLength(offset) if err != nil { return 0, err } - vv = make(map[string]string, vvl) - for vvi := 0; vvi < vvl; vvi++ { - var kkv string - kkv, offset, err = decoder.AsString(offset) + vv = make([]byte, vvl) + for vvi := range vv { + var vvv byte + vvv, offset, err = decoder.AsByte(offset) if err != nil { return 0, err } - var vvv string - vvv, offset, err = decoder.AsString(offset) + vv[vvi] = vvv + } + v.CRLData = vv + } else { + offset++ + } + if !decoder.IsCodeNil(offset) { + var vv []byte + var vvl int + vvl, offset, err = decoder.SliceLength(offset) + if err != nil { + return 0, err + } + vv = make([]byte, vvl) + for vvi := range vv { + var vvv byte + vvv, offset, err = decoder.AsByte(offset) if err != nil { return 0, err } - vv[kkv] = vvv + vv[vvi] = vvv } - v.MoreInfo = vv + v.CRLNumber = vv } else { offset++ } return offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo -func ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthInfo, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse +func ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *FetchCRLResponse, decoder *dec.Decoder, offset int) (int, error) { keys := [][]byte{ - {uint8(0x53), uint8(0x6f), uint8(0x75), uint8(0x72), uint8(0x63), uint8(0x65)}, // Source - {uint8(0x48), uint8(0x65), uint8(0x61), uint8(0x6c), uint8(0x74), uint8(0x68), uint8(0x79)}, // Healthy - {uint8(0x4d), uint8(0x6f), uint8(0x72), uint8(0x65), uint8(0x49), uint8(0x6e), uint8(0x66), uint8(0x6f)}, // MoreInfo + {uint8(0x69), uint8(0x73), uint8(0x73), uint8(0x75), uint8(0x65), uint8(0x72), uint8(0x5f), uint8(0x69), uint8(0x64)}, // issuer_id + {uint8(0x69), uint8(0x73), uint8(0x5f), uint8(0x64), uint8(0x65), uint8(0x6c), uint8(0x74), uint8(0x61)}, // is_delta + {uint8(0x75), uint8(0x6e), uint8(0x63), uint8(0x68), uint8(0x61), uint8(0x6e), uint8(0x67), uint8(0x65), uint8(0x64)}, // unchanged + {uint8(0x63), uint8(0x72), uint8(0x6c), uint8(0x5f), uint8(0x64), uint8(0x61), uint8(0x74), uint8(0x61)}, // crl_data + {uint8(0x63), uint8(0x72), uint8(0x6c), uint8(0x5f), uint8(0x6e), uint8(0x75), uint8(0x6d), uint8(0x62), uint8(0x65), uint8(0x72)}, // crl_number } - offset, err := decoder.CheckStructHeader(3, offset) + offset, err := decoder.CheckStructHeader(5, offset) if err != nil { return 0, err } count := 0 - for count < 3 { + for count < 5 { var dataKey []byte dataKey, offset, err = decoder.AsStringBytes(offset) if err != nil { @@ -1216,7 +1399,7 @@ func ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5 if err != nil { return 0, err } - v.Source = vv + v.IssuerID = vv } count++ case 1: @@ -1226,32 +1409,59 @@ func ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5 if err != nil { return 0, err } - v.Healthy = vv + v.IsDelta = vv } count++ case 2: + { + var vv bool + vv, offset, err = decoder.AsBool(offset) + if err != nil { + return 0, err + } + v.UnChanged = vv + } + count++ + case 3: if !decoder.IsCodeNil(offset) { - var vv map[string]string + var vv []byte var vvl int - vvl, offset, err = decoder.MapLength(offset) + vvl, offset, err = decoder.SliceLength(offset) if err != nil { return 0, err } - vv = make(map[string]string, vvl) - for vvi := 0; vvi < vvl; vvi++ { - var kkv string - kkv, offset, err = decoder.AsString(offset) + vv = make([]byte, vvl) + for vvi := range vv { + var vvv byte + vvv, offset, err = decoder.AsByte(offset) if err != nil { return 0, err } - var vvv string - vvv, offset, err = decoder.AsString(offset) + vv[vvi] = vvv + } + v.CRLData = vv + } else { + offset++ + } + count++ + case 4: + if !decoder.IsCodeNil(offset) { + var vv []byte + var vvl int + vvl, offset, err = decoder.SliceLength(offset) + if err != nil { + return 0, err + } + vv = make([]byte, vvl) + for vvi := range vv { + var vvv byte + vvv, offset, err = decoder.AsByte(offset) if err != nil { return 0, err } - vv[kkv] = vvv + vv[vvi] = vvv } - v.MoreInfo = vv + v.CRLNumber = vv } else { offset++ } @@ -1263,29 +1473,96 @@ func ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5 return offset, err } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse -func ___calcArraySizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand +func ___calcArraySizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder) (int, error) { + size := 0 + size += encoder.CalcStructHeaderFix(0) + return size, nil +} + +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand +func ___calcMapSizeHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder) (int, error) { + size := 0 + size += encoder.CalcStructHeaderFix(0) + return size, nil +} + +// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand +func ___encodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { + var err error + offset = encoder.WriteStructHeaderFixAsArray(0, offset) + return encoder.EncodedBytes(), offset, err +} + +// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand +func ___encodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthCommand, encoder *enc.Encoder, offset int) ([]byte, int, error) { + var err error + offset = encoder.WriteStructHeaderFixAsMap(0, offset) + return encoder.EncodedBytes(), offset, err +} + +// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand +func ___decodeArrayHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthCommand, decoder *dec.Decoder, offset int) (int, error) { + offset, err := decoder.CheckStructHeader(0, offset) + if err != nil { + return 0, err + } + return offset, err +} + +// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthCommand +func ___decodeMapHealthCommand_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthCommand, decoder *dec.Decoder, offset int) (int, error) { + keys := [][]byte{} + offset, err := decoder.CheckStructHeader(0, offset) + if err != nil { + return 0, err + } + count := 0 + for count < 0 { + var dataKey []byte + dataKey, offset, err = decoder.AsStringBytes(offset) + if err != nil { + return 0, err + } + fieldIndex := -1 + for i, key := range keys { + if len(dataKey) != len(key) { + continue + } + fieldIndex = i + for dataKeyIndex := range dataKey { + if dataKey[dataKeyIndex] != key[dataKeyIndex] { + fieldIndex = -1 + break + } + } + if fieldIndex >= 0 { + break + } + } + switch fieldIndex { + default: + return 0, fmt.Errorf("unknown key[%s] found", string(dataKey)) + } + } + return offset, err +} + +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo +func ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder) (int, error) { size := 0 size += encoder.CalcStructHeaderFix(3) - size += encoder.CalcString(v.Version) + size += encoder.CalcString(v.Source) size += encoder.CalcBool(v.Healthy) - if v.Info != nil { - s, err := encoder.CalcSliceLength(len(v.Info), false) + if v.MoreInfo != nil { + s, err := encoder.CalcMapLength(len(v.MoreInfo)) if err != nil { return 0, err } size += s - for _, vv := range v.Info { - if vv != nil { - vvp := *vv - size_vvp, err := ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder) - if err != nil { - return 0, err - } - size += size_vvp - } else { - size += encoder.CalcNil() - } + for kk, vv := range v.MoreInfo { + size += encoder.CalcString(kk) + size += encoder.CalcString(vv) } } else { size += encoder.CalcNil() @@ -1293,57 +1570,42 @@ func ___calcArraySizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81 return size, nil } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse -func ___calcMapSizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo +func ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder) (int, error) { size := 0 size += encoder.CalcStructHeaderFix(3) - size += encoder.CalcStringFix(7) - size += encoder.CalcString(v.Version) + size += encoder.CalcStringFix(6) + size += encoder.CalcString(v.Source) size += encoder.CalcStringFix(7) size += encoder.CalcBool(v.Healthy) - size += encoder.CalcStringFix(4) - if v.Info != nil { - s, err := encoder.CalcSliceLength(len(v.Info), false) + size += encoder.CalcStringFix(8) + if v.MoreInfo != nil { + s, err := encoder.CalcMapLength(len(v.MoreInfo)) if err != nil { return 0, err } size += s - for _, vv := range v.Info { - if vv != nil { - vvp := *vv - size_vvp, err := ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder) - if err != nil { - return 0, err - } - size += size_vvp - } else { - size += encoder.CalcNil() - } + for kk, vv := range v.MoreInfo { + size += encoder.CalcString(kk) + size += encoder.CalcString(vv) } } else { size += encoder.CalcNil() } return size, nil -} - -// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse -func ___encodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { - var err error - offset = encoder.WriteStructHeaderFixAsArray(3, offset) - offset = encoder.WriteString(v.Version, offset) - offset = encoder.WriteBool(v.Healthy, offset) - if v.Info != nil { - offset = encoder.WriteSliceLength(len(v.Info), offset, false) - for _, vv := range v.Info { - if vv != nil { - vvp := *vv - _, offset, err = ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder, offset) - if err != nil { - return nil, 0, err - } - } else { - offset = encoder.WriteNil(offset) - } +} + +// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo +func ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder, offset int) ([]byte, int, error) { + var err error + offset = encoder.WriteStructHeaderFixAsArray(3, offset) + offset = encoder.WriteString(v.Source, offset) + offset = encoder.WriteBool(v.Healthy, offset) + if v.MoreInfo != nil { + offset = encoder.WriteMapLength(len(v.MoreInfo), offset) + for kk, vv := range v.MoreInfo { + offset = encoder.WriteString(kk, offset) + offset = encoder.WriteString(vv, offset) } } else { offset = encoder.WriteNil(offset) @@ -1351,27 +1613,20 @@ func ___encodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a8137 return encoder.EncodedBytes(), offset, err } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse -func ___encodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo +func ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthInfo, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error offset = encoder.WriteStructHeaderFixAsMap(3, offset) - offset = encoder.WriteStringFix("version", 7, offset) - offset = encoder.WriteString(v.Version, offset) - offset = encoder.WriteStringFix("healthy", 7, offset) + offset = encoder.WriteStringFix("Source", 6, offset) + offset = encoder.WriteString(v.Source, offset) + offset = encoder.WriteStringFix("Healthy", 7, offset) offset = encoder.WriteBool(v.Healthy, offset) - offset = encoder.WriteStringFix("Info", 4, offset) - if v.Info != nil { - offset = encoder.WriteSliceLength(len(v.Info), offset, false) - for _, vv := range v.Info { - if vv != nil { - vvp := *vv - _, offset, err = ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder, offset) - if err != nil { - return nil, 0, err - } - } else { - offset = encoder.WriteNil(offset) - } + offset = encoder.WriteStringFix("MoreInfo", 8, offset) + if v.MoreInfo != nil { + offset = encoder.WriteMapLength(len(v.MoreInfo), offset) + for kk, vv := range v.MoreInfo { + offset = encoder.WriteString(kk, offset) + offset = encoder.WriteString(vv, offset) } } else { offset = encoder.WriteNil(offset) @@ -1379,8 +1634,8 @@ func ___encodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f return encoder.EncodedBytes(), offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse -func ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthResponse, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo +func ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthInfo, decoder *dec.Decoder, offset int) (int, error) { offset, err := decoder.CheckStructHeader(3, offset) if err != nil { return 0, err @@ -1391,7 +1646,7 @@ func ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a8137 if err != nil { return 0, err } - v.Version = vv + v.Source = vv } { var vv bool @@ -1402,40 +1657,39 @@ func ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a8137 v.Healthy = vv } if !decoder.IsCodeNil(offset) { - var vv []*HealthInfo + var vv map[string]string var vvl int - vvl, offset, err = decoder.SliceLength(offset) + vvl, offset, err = decoder.MapLength(offset) if err != nil { return 0, err } - vv = make([]*HealthInfo, vvl) - for vvi := range vv { - var vvv *HealthInfo - if !decoder.IsCodeNil(offset) { - var vvvp HealthInfo - offset, err = ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(&vvvp, decoder, offset) - if err != nil { - return 0, err - } - vvv = &vvvp - } else { - offset++ + vv = make(map[string]string, vvl) + for vvi := 0; vvi < vvl; vvi++ { + var kkv string + kkv, offset, err = decoder.AsString(offset) + if err != nil { + return 0, err } - vv[vvi] = vvv + var vvv string + vvv, offset, err = decoder.AsString(offset) + if err != nil { + return 0, err + } + vv[kkv] = vvv } - v.Info = vv + v.MoreInfo = vv } else { offset++ } return offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse -func ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthResponse, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthInfo +func ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthInfo, decoder *dec.Decoder, offset int) (int, error) { keys := [][]byte{ - {uint8(0x76), uint8(0x65), uint8(0x72), uint8(0x73), uint8(0x69), uint8(0x6f), uint8(0x6e)}, // version - {uint8(0x68), uint8(0x65), uint8(0x61), uint8(0x6c), uint8(0x74), uint8(0x68), uint8(0x79)}, // healthy - {uint8(0x49), uint8(0x6e), uint8(0x66), uint8(0x6f)}, // Info + {uint8(0x53), uint8(0x6f), uint8(0x75), uint8(0x72), uint8(0x63), uint8(0x65)}, // Source + {uint8(0x48), uint8(0x65), uint8(0x61), uint8(0x6c), uint8(0x74), uint8(0x68), uint8(0x79)}, // Healthy + {uint8(0x4d), uint8(0x6f), uint8(0x72), uint8(0x65), uint8(0x49), uint8(0x6e), uint8(0x66), uint8(0x6f)}, // MoreInfo } offset, err := decoder.CheckStructHeader(3, offset) if err != nil { @@ -1472,7 +1726,7 @@ func ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f if err != nil { return 0, err } - v.Version = vv + v.Source = vv } count++ case 1: @@ -1487,28 +1741,27 @@ func ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f count++ case 2: if !decoder.IsCodeNil(offset) { - var vv []*HealthInfo + var vv map[string]string var vvl int - vvl, offset, err = decoder.SliceLength(offset) + vvl, offset, err = decoder.MapLength(offset) if err != nil { return 0, err } - vv = make([]*HealthInfo, vvl) - for vvi := range vv { - var vvv *HealthInfo - if !decoder.IsCodeNil(offset) { - var vvvp HealthInfo - offset, err = ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(&vvvp, decoder, offset) - if err != nil { - return 0, err - } - vvv = &vvvp - } else { - offset++ + vv = make(map[string]string, vvl) + for vvi := 0; vvi < vvl; vvi++ { + var kkv string + kkv, offset, err = decoder.AsString(offset) + if err != nil { + return 0, err } - vv[vvi] = vvv + var vvv string + vvv, offset, err = decoder.AsString(offset) + if err != nil { + return 0, err + } + vv[kkv] = vvv } - v.Info = vv + v.MoreInfo = vv } else { offset++ } @@ -1520,33 +1773,29 @@ func ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f return offset, err } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse -func ___calcArraySizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse +func ___calcArraySizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder) (int, error) { size := 0 - size += encoder.CalcStructHeaderFix(5) - size += encoder.CalcString(v.IssuerID) - size += encoder.CalcBool(v.IsDelta) - size += encoder.CalcBool(v.UnChanged) - if v.CRLData != nil { - s, err := encoder.CalcSliceLength(len(v.CRLData), true) - if err != nil { - return 0, err - } - size += s - for _, vv := range v.CRLData { - size += encoder.CalcByte(vv) - } - } else { - size += encoder.CalcNil() - } - if v.CRLNumber != nil { - s, err := encoder.CalcSliceLength(len(v.CRLNumber), true) + size += encoder.CalcStructHeaderFix(3) + size += encoder.CalcString(v.Version) + size += encoder.CalcBool(v.Healthy) + if v.Info != nil { + s, err := encoder.CalcSliceLength(len(v.Info), false) if err != nil { return 0, err } size += s - for _, vv := range v.CRLNumber { - size += encoder.CalcByte(vv) + for _, vv := range v.Info { + if vv != nil { + vvp := *vv + size_vvp, err := ___calcArraySizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder) + if err != nil { + return 0, err + } + size += size_vvp + } else { + size += encoder.CalcNil() + } } } else { size += encoder.CalcNil() @@ -1554,38 +1803,32 @@ func ___calcArraySizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a return size, nil } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse -func ___calcMapSizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse +func ___calcMapSizeHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder) (int, error) { size := 0 - size += encoder.CalcStructHeaderFix(5) - size += encoder.CalcStringFix(9) - size += encoder.CalcString(v.IssuerID) - size += encoder.CalcStringFix(8) - size += encoder.CalcBool(v.IsDelta) - size += encoder.CalcStringFix(9) - size += encoder.CalcBool(v.UnChanged) - size += encoder.CalcStringFix(8) - if v.CRLData != nil { - s, err := encoder.CalcSliceLength(len(v.CRLData), true) - if err != nil { - return 0, err - } - size += s - for _, vv := range v.CRLData { - size += encoder.CalcByte(vv) - } - } else { - size += encoder.CalcNil() - } - size += encoder.CalcStringFix(10) - if v.CRLNumber != nil { - s, err := encoder.CalcSliceLength(len(v.CRLNumber), true) + size += encoder.CalcStructHeaderFix(3) + size += encoder.CalcStringFix(7) + size += encoder.CalcString(v.Version) + size += encoder.CalcStringFix(7) + size += encoder.CalcBool(v.Healthy) + size += encoder.CalcStringFix(4) + if v.Info != nil { + s, err := encoder.CalcSliceLength(len(v.Info), false) if err != nil { return 0, err } size += s - for _, vv := range v.CRLNumber { - size += encoder.CalcByte(vv) + for _, vv := range v.Info { + if vv != nil { + vvp := *vv + size_vvp, err := ___calcMapSizeHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder) + if err != nil { + return 0, err + } + size += size_vvp + } else { + size += encoder.CalcNil() + } } } else { size += encoder.CalcNil() @@ -1593,56 +1836,52 @@ func ___calcMapSizeFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81 return size, nil } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse -func ___encodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { - var err error - offset = encoder.WriteStructHeaderFixAsArray(5, offset) - offset = encoder.WriteString(v.IssuerID, offset) - offset = encoder.WriteBool(v.IsDelta, offset) - offset = encoder.WriteBool(v.UnChanged, offset) - if v.CRLData != nil { - offset = encoder.WriteSliceLength(len(v.CRLData), offset, true) - for _, vv := range v.CRLData { - offset = encoder.WriteByte(vv, offset) - } - } else { - offset = encoder.WriteNil(offset) - } - if v.CRLNumber != nil { - offset = encoder.WriteSliceLength(len(v.CRLNumber), offset, true) - for _, vv := range v.CRLNumber { - offset = encoder.WriteByte(vv, offset) - } - } else { - offset = encoder.WriteNil(offset) - } - return encoder.EncodedBytes(), offset, err -} - -// encode from git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse -func ___encodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v FetchCRLResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse +func ___encodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error - offset = encoder.WriteStructHeaderFixAsMap(5, offset) - offset = encoder.WriteStringFix("issuer_id", 9, offset) - offset = encoder.WriteString(v.IssuerID, offset) - offset = encoder.WriteStringFix("is_delta", 8, offset) - offset = encoder.WriteBool(v.IsDelta, offset) - offset = encoder.WriteStringFix("unchanged", 9, offset) - offset = encoder.WriteBool(v.UnChanged, offset) - offset = encoder.WriteStringFix("crl_data", 8, offset) - if v.CRLData != nil { - offset = encoder.WriteSliceLength(len(v.CRLData), offset, true) - for _, vv := range v.CRLData { - offset = encoder.WriteByte(vv, offset) + offset = encoder.WriteStructHeaderFixAsArray(3, offset) + offset = encoder.WriteString(v.Version, offset) + offset = encoder.WriteBool(v.Healthy, offset) + if v.Info != nil { + offset = encoder.WriteSliceLength(len(v.Info), offset, false) + for _, vv := range v.Info { + if vv != nil { + vvp := *vv + _, offset, err = ___encodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder, offset) + if err != nil { + return nil, 0, err + } + } else { + offset = encoder.WriteNil(offset) + } } } else { offset = encoder.WriteNil(offset) } - offset = encoder.WriteStringFix("crl_number", 10, offset) - if v.CRLNumber != nil { - offset = encoder.WriteSliceLength(len(v.CRLNumber), offset, true) - for _, vv := range v.CRLNumber { - offset = encoder.WriteByte(vv, offset) + return encoder.EncodedBytes(), offset, err +} + +// encode from git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse +func ___encodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v HealthResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { + var err error + offset = encoder.WriteStructHeaderFixAsMap(3, offset) + offset = encoder.WriteStringFix("version", 7, offset) + offset = encoder.WriteString(v.Version, offset) + offset = encoder.WriteStringFix("healthy", 7, offset) + offset = encoder.WriteBool(v.Healthy, offset) + offset = encoder.WriteStringFix("Info", 4, offset) + if v.Info != nil { + offset = encoder.WriteSliceLength(len(v.Info), offset, false) + for _, vv := range v.Info { + if vv != nil { + vvp := *vv + _, offset, err = ___encodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(vvp, encoder, offset) + if err != nil { + return nil, 0, err + } + } else { + offset = encoder.WriteNil(offset) + } } } else { offset = encoder.WriteNil(offset) @@ -1650,9 +1889,9 @@ func ___encodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a8137 return encoder.EncodedBytes(), offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse -func ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *FetchCRLResponse, decoder *dec.Decoder, offset int) (int, error) { - offset, err := decoder.CheckStructHeader(5, offset) +// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse +func ___decodeArrayHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthResponse, decoder *dec.Decoder, offset int) (int, error) { + offset, err := decoder.CheckStructHeader(3, offset) if err != nil { return 0, err } @@ -1662,15 +1901,7 @@ func ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81 if err != nil { return 0, err } - v.IssuerID = vv - } - { - var vv bool - vv, offset, err = decoder.AsBool(offset) - if err != nil { - return 0, err - } - v.IsDelta = vv + v.Version = vv } { var vv bool @@ -1678,66 +1909,50 @@ func ___decodeArrayFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81 if err != nil { return 0, err } - v.UnChanged = vv - } - if !decoder.IsCodeNil(offset) { - var vv []byte - var vvl int - vvl, offset, err = decoder.SliceLength(offset) - if err != nil { - return 0, err - } - vv = make([]byte, vvl) - for vvi := range vv { - var vvv byte - vvv, offset, err = decoder.AsByte(offset) - if err != nil { - return 0, err - } - vv[vvi] = vvv - } - v.CRLData = vv - } else { - offset++ + v.Healthy = vv } if !decoder.IsCodeNil(offset) { - var vv []byte + var vv []*HealthInfo var vvl int vvl, offset, err = decoder.SliceLength(offset) if err != nil { return 0, err } - vv = make([]byte, vvl) + vv = make([]*HealthInfo, vvl) for vvi := range vv { - var vvv byte - vvv, offset, err = decoder.AsByte(offset) - if err != nil { - return 0, err + var vvv *HealthInfo + if !decoder.IsCodeNil(offset) { + var vvvp HealthInfo + offset, err = ___decodeArrayHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(&vvvp, decoder, offset) + if err != nil { + return 0, err + } + vvv = &vvvp + } else { + offset++ } vv[vvi] = vvv } - v.CRLNumber = vv + v.Info = vv } else { offset++ } return offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.FetchCRLResponse -func ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *FetchCRLResponse, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.HealthResponse +func ___decodeMapHealthResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *HealthResponse, decoder *dec.Decoder, offset int) (int, error) { keys := [][]byte{ - {uint8(0x69), uint8(0x73), uint8(0x73), uint8(0x75), uint8(0x65), uint8(0x72), uint8(0x5f), uint8(0x69), uint8(0x64)}, // issuer_id - {uint8(0x69), uint8(0x73), uint8(0x5f), uint8(0x64), uint8(0x65), uint8(0x6c), uint8(0x74), uint8(0x61)}, // is_delta - {uint8(0x75), uint8(0x6e), uint8(0x63), uint8(0x68), uint8(0x61), uint8(0x6e), uint8(0x67), uint8(0x65), uint8(0x64)}, // unchanged - {uint8(0x63), uint8(0x72), uint8(0x6c), uint8(0x5f), uint8(0x64), uint8(0x61), uint8(0x74), uint8(0x61)}, // crl_data - {uint8(0x63), uint8(0x72), uint8(0x6c), uint8(0x5f), uint8(0x6e), uint8(0x75), uint8(0x6d), uint8(0x62), uint8(0x65), uint8(0x72)}, // crl_number + {uint8(0x76), uint8(0x65), uint8(0x72), uint8(0x73), uint8(0x69), uint8(0x6f), uint8(0x6e)}, // version + {uint8(0x68), uint8(0x65), uint8(0x61), uint8(0x6c), uint8(0x74), uint8(0x68), uint8(0x79)}, // healthy + {uint8(0x49), uint8(0x6e), uint8(0x66), uint8(0x6f)}, // Info } - offset, err := decoder.CheckStructHeader(5, offset) + offset, err := decoder.CheckStructHeader(3, offset) if err != nil { return 0, err } count := 0 - for count < 5 { + for count < 3 { var dataKey []byte dataKey, offset, err = decoder.AsStringBytes(offset) if err != nil { @@ -1767,7 +1982,7 @@ func ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a8137 if err != nil { return 0, err } - v.IssuerID = vv + v.Version = vv } count++ case 1: @@ -1777,59 +1992,33 @@ func ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a8137 if err != nil { return 0, err } - v.IsDelta = vv + v.Healthy = vv } count++ case 2: - { - var vv bool - vv, offset, err = decoder.AsBool(offset) - if err != nil { - return 0, err - } - v.UnChanged = vv - } - count++ - case 3: if !decoder.IsCodeNil(offset) { - var vv []byte - var vvl int - vvl, offset, err = decoder.SliceLength(offset) - if err != nil { - return 0, err - } - vv = make([]byte, vvl) - for vvi := range vv { - var vvv byte - vvv, offset, err = decoder.AsByte(offset) - if err != nil { - return 0, err - } - vv[vvi] = vvv - } - v.CRLData = vv - } else { - offset++ - } - count++ - case 4: - if !decoder.IsCodeNil(offset) { - var vv []byte + var vv []*HealthInfo var vvl int vvl, offset, err = decoder.SliceLength(offset) if err != nil { return 0, err } - vv = make([]byte, vvl) + vv = make([]*HealthInfo, vvl) for vvi := range vv { - var vvv byte - vvv, offset, err = decoder.AsByte(offset) - if err != nil { - return 0, err + var vvv *HealthInfo + if !decoder.IsCodeNil(offset) { + var vvvp HealthInfo + offset, err = ___decodeMapHealthInfo_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(&vvvp, decoder, offset) + if err != nil { + return 0, err + } + vvv = &vvvp + } else { + offset++ } vv[vvi] = vvv } - v.CRLNumber = vv + v.Info = vv } else { offset++ } @@ -1841,61 +2030,109 @@ func ___decodeMapFetchCRLResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a8137 return offset, err } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse -func ___calcArraySizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.SignCertificateResponse +func ___calcArraySizeSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v SignCertificateResponse, encoder *enc.Encoder) (int, error) { size := 0 size += encoder.CalcStructHeaderFix(1) - size += encoder.CalcString(v.Message) + if v.CertificateData != nil { + s, err := encoder.CalcSliceLength(len(v.CertificateData), true) + if err != nil { + return 0, err + } + size += s + for _, vv := range v.CertificateData { + size += encoder.CalcByte(vv) + } + } else { + size += encoder.CalcNil() + } return size, nil } -// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse -func ___calcMapSizeErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder) (int, error) { +// calculate size from git.cacert.org/cacert-gosigner/pkg/messages.SignCertificateResponse +func ___calcMapSizeSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v SignCertificateResponse, encoder *enc.Encoder) (int, error) { size := 0 size += encoder.CalcStructHeaderFix(1) - size += encoder.CalcStringFix(7) - size += encoder.CalcString(v.Message) + size += encoder.CalcStringFix(9) + if v.CertificateData != nil { + s, err := encoder.CalcSliceLength(len(v.CertificateData), true) + if err != nil { + return 0, err + } + size += s + for _, vv := range v.CertificateData { + size += encoder.CalcByte(vv) + } + } else { + size += encoder.CalcNil() + } return size, nil } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse -func ___encodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.SignCertificateResponse +func ___encodeArraySignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v SignCertificateResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error offset = encoder.WriteStructHeaderFixAsArray(1, offset) - offset = encoder.WriteString(v.Message, offset) + if v.CertificateData != nil { + offset = encoder.WriteSliceLength(len(v.CertificateData), offset, true) + for _, vv := range v.CertificateData { + offset = encoder.WriteByte(vv, offset) + } + } else { + offset = encoder.WriteNil(offset) + } return encoder.EncodedBytes(), offset, err } -// encode from git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse -func ___encodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v ErrorResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { +// encode from git.cacert.org/cacert-gosigner/pkg/messages.SignCertificateResponse +func ___encodeMapSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v SignCertificateResponse, encoder *enc.Encoder, offset int) ([]byte, int, error) { var err error offset = encoder.WriteStructHeaderFixAsMap(1, offset) - offset = encoder.WriteStringFix("message", 7, offset) - offset = encoder.WriteString(v.Message, offset) + offset = encoder.WriteStringFix("cert_data", 9, offset) + if v.CertificateData != nil { + offset = encoder.WriteSliceLength(len(v.CertificateData), offset, true) + for _, vv := range v.CertificateData { + offset = encoder.WriteByte(vv, offset) + } + } else { + offset = encoder.WriteNil(offset) + } return encoder.EncodedBytes(), offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse -func ___decodeArrayErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *ErrorResponse, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.SignCertificateResponse +func ___decodeArraySignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *SignCertificateResponse, decoder *dec.Decoder, offset int) (int, error) { offset, err := decoder.CheckStructHeader(1, offset) if err != nil { return 0, err } - { - var vv string - vv, offset, err = decoder.AsString(offset) + if !decoder.IsCodeNil(offset) { + var vv []byte + var vvl int + vvl, offset, err = decoder.SliceLength(offset) if err != nil { return 0, err } - v.Message = vv + vv = make([]byte, vvl) + for vvi := range vv { + var vvv byte + vvv, offset, err = decoder.AsByte(offset) + if err != nil { + return 0, err + } + vv[vvi] = vvv + } + v.CertificateData = vv + } else { + offset++ } return offset, err } -// decode to git.cacert.org/cacert-gosigner/pkg/messages.ErrorResponse -func ___decodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *ErrorResponse, decoder *dec.Decoder, offset int) (int, error) { +// decode to git.cacert.org/cacert-gosigner/pkg/messages.SignCertificateResponse +func ___decodeMapSignCertificateResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f81e5b18c3d86855d(v *SignCertificateResponse, decoder *dec.Decoder, offset int) (int, error) { keys := [][]byte{ - {uint8(0x6d), uint8(0x65), uint8(0x73), uint8(0x73), uint8(0x61), uint8(0x67), uint8(0x65)}, // message + {uint8(0x63), uint8(0x65), uint8(0x72), uint8(0x74), uint8(0x5f), uint8(0x64), uint8(0x61), uint8(0x74), uint8(0x61)}, // cert_data } offset, err := decoder.CheckStructHeader(1, offset) if err != nil { @@ -1926,13 +2163,25 @@ func ___decodeMapErrorResponse_e587a81c7cb163b35488bdef0f58c292f99f4bd65a81377f8 } switch fieldIndex { case 0: - { - var vv string - vv, offset, err = decoder.AsString(offset) + if !decoder.IsCodeNil(offset) { + var vv []byte + var vvl int + vvl, offset, err = decoder.SliceLength(offset) if err != nil { return 0, err } - v.Message = vv + vv = make([]byte, vvl) + for vvi := range vv { + var vvv byte + vvv, offset, err = decoder.AsByte(offset) + if err != nil { + return 0, err + } + vv[vvi] = vvv + } + v.CertificateData = vv + } else { + offset++ } count++ default: