aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-12 02:53:20 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-12 02:53:20 +0100
commit18e21518b72256e48aad508d65a66fbc94d819d6 (patch)
treea4d19231e6c3b9db1d16bc0abf4d664f372af04b /cmd
parent24f86d7ec81d97d3fbbf689fd9626b5339084ab7 (diff)
simplify
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 7097766..ffa74c9 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -28,7 +28,7 @@ func dialProvider(p provider) error {
return nil
}
-func loadaccount(a account) (*acme.Account, error) {
+func load(a account) (*acme.Account, error) {
key, err := a.Load()
if err != nil {
return nil, err
@@ -67,7 +67,7 @@ func register(prov *acme.Provider, a account) (*acme.Account, error) {
}
func loadAccount(prov *acme.Provider, a account) error {
- acc, err := loadaccount(a)
+ acc, err := load(a)
if err != nil {
acc, err = register(prov, a)
if err != nil {
@@ -85,12 +85,8 @@ func loadAccount(prov *acme.Provider, a account) error {
func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
c, err := d.Load()
if err != nil {
- if err == ErrNotFound {
- c.PrivateKey, err = acme.NewKey(d.KeySize)
- if err != nil {
- return err
- }
- } else {
+ c.PrivateKey, err = acme.NewKey(d.KeySize)
+ if err != nil {
return err
}
}