aboutsummaryrefslogtreecommitdiff
path: root/cmd/acmed/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/acmed/main.go')
-rw-r--r--cmd/acmed/main.go14
1 files changed, 4 insertions, 10 deletions
diff --git a/cmd/acmed/main.go b/cmd/acmed/main.go
index 01691e5..b6602f7 100644
--- a/cmd/acmed/main.go
+++ b/cmd/acmed/main.go
@@ -27,8 +27,8 @@ func newKey(w io.Writer, size int) (*rsa.PrivateKey, error) {
return key, pem.Encode(w, block)
}
-func chkKey(baseDir string, k Keychain) (*rsa.PrivateKey, error) {
- key := path.Join(baseDir, k.Path())
+func chkKey(k Keychain) (*rsa.PrivateKey, error) {
+ key := k.Path()
flags := os.O_WRONLY | os.O_CREATE | os.O_TRUNC
if _, err := os.Stat(key); os.IsNotExist(err) {
log.Println("allocating", key, k.Size())
@@ -59,10 +59,7 @@ func main() {
}
for k, acc := range conf.Account {
- if acc.KeySize == 0 {
- acc.KeySize = conf.Defaults.KeySize
- }
- acc.key, err = chkKey(conf.Defaults.Basedir, acc)
+ acc.key, err = chkKey(acc)
if err != nil {
log.Fatal(err)
}
@@ -70,10 +67,7 @@ func main() {
}
for k, des := range conf.Desire {
- if des.KeySize == 0 {
- des.KeySize = conf.Defaults.KeySize
- }
- des.key, err = chkKey(conf.Defaults.Basedir, des)
+ des.key, err = chkKey(des)
if err != nil {
log.Fatal(err)
}