aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-25 15:51:39 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-25 15:51:39 +0100
commit201b1c88ab95818f8fbfe02658962bf06638b0f2 (patch)
tree379d715210d9b11fec35f62854c0ac9c89fbf64a
parente20bb5c590dfd2f5a5b84e235920ca6550cb13df (diff)
shorten name
-rw-r--r--desire.go8
-rw-r--r--messages.go28
-rw-r--r--provider.go10
3 files changed, 23 insertions, 23 deletions
diff --git a/desire.go b/desire.go
index dc5e39e..cf3bb98 100644
--- a/desire.go
+++ b/desire.go
@@ -11,13 +11,13 @@ import (
"syscall"
)
-type smap map[ChallengeType]Solver
+type smap map[ChalType]Solver
type Desire struct {
altnames []string
key crypto.PrivateKey
cert []*x509.Certificate
- solver map[ChallengeType]Solver
+ solver map[ChalType]Solver
}
func NewDesire(altnames []string, size int) (*Desire, error) {
@@ -28,11 +28,11 @@ func NewDesire(altnames []string, size int) (*Desire, error) {
return &Desire{
key: key,
altnames: altnames,
- solver: make(map[ChallengeType]Solver),
+ solver: make(map[ChalType]Solver),
}, nil
}
-func (d *Desire) RegisterSolver(c ChallengeType, s Solver) {
+func (d *Desire) RegisterSolver(c ChalType, s Solver) {
d.solver[c] = s
}
diff --git a/messages.go b/messages.go
index b566b1a..796d0e2 100644
--- a/messages.go
+++ b/messages.go
@@ -46,7 +46,7 @@ type Authorization struct {
Combinations [][]int `json:"combinations,omitempty"`
}
-func (a Authorization) Supported(sol map[ChallengeType]Solver) []Challenge {
+func (a Authorization) Supported(sol map[ChalType]Solver) []Challenge {
supported := func(c []int) bool {
for _, com := range c {
ch := a.Challenges[com]
@@ -78,14 +78,14 @@ type Identifier struct {
// Challege ...
type Challenge struct {
- Resource Resource `json:"resource"` // challenge
- Type ChallengeType `json:"type"`
- Token string `json:"token,omitempty"`
- Status Status `json:"status,omitempty"` // e.g. valid
- URI string `json:"uri,omitempty"`
- Validated *time.Time `json:"validated,omitempty"`
- KeyAuthorization string `json:"keyAuthorization,omitempty"`
- Err *Problem `json:"error,omitempty"`
+ Resource Resource `json:"resource"` // challenge
+ Type ChalType `json:"type"`
+ Token string `json:"token,omitempty"`
+ Status Status `json:"status,omitempty"` // e.g. valid
+ URI string `json:"uri,omitempty"`
+ Validated *time.Time `json:"validated,omitempty"`
+ KeyAuthorization string `json:"keyAuthorization,omitempty"`
+ Err *Problem `json:"error,omitempty"`
Solver `json:"-"`
}
@@ -132,13 +132,13 @@ type IdentType string
const IdentDNS IdentType = "dns"
-type ChallengeType string
+type ChalType string
const (
- ChallengeHTTP ChallengeType = "http-01"
- ChallengeTLS ChallengeType = "tls-sni-01"
- ChallengePOP ChallengeType = "proofOfPossession-01"
- ChallengeDNS ChallengeType = "dns-01"
+ ChallengeHTTP ChalType = "http-01"
+ ChallengeTLS ChalType = "tls-sni-01"
+ ChallengePOP ChalType = "proofOfPossession-01"
+ ChallengeDNS ChalType = "dns-01"
)
type CSR struct {
diff --git a/provider.go b/provider.go
index ecb1bfd..f671c32 100644
--- a/provider.go
+++ b/provider.go
@@ -20,10 +20,10 @@ type Provider struct {
}
var (
- errNoNonces = errors.New("out of nonces")
- errContentType = errors.New("unknown content type")
- errChallengeType = errors.New("unknown challenge")
- errStatus = errors.New("unexpected status")
+ errNoNonces = errors.New("out of nonces")
+ errContentType = errors.New("unknown content type")
+ errChalType = errors.New("unknown challenge")
+ errStatus = errors.New("unexpected status")
)
const (
@@ -194,7 +194,7 @@ func (p *Provider) solve(s Signer, ch Challenge) error {
return ch.Solved()
}
-func (p *Provider) authz(s Signer, domain string, sol map[ChallengeType]Solver) error {
+func (p *Provider) authz(s Signer, domain string, sol map[ChalType]Solver) error {
// first step: pocke
r := &Authorization{
Resource: ResNewAuthz,