aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-06-05 22:21:21 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-06-05 22:21:21 +0200
commite6e89fbebc8b585d7b94519993ab472d702394b4 (patch)
tree7b4883b96b9beabfa9b5ecf3a0ab7e6ce48fd10f /cmd
parentc1bbfede72bf9b81a8be2eb52dbedc964e837667 (diff)
Strip mail OID, as it gets filtered
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go6
-rw-r--r--cmd/batch/main.go8
2 files changed, 5 insertions, 9 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index cac04e2..1a7aa78 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -48,7 +48,7 @@ func register(d desire, dir string) (crypto.PrivateKey, error) {
return key, nil
}
-func requestCert(prov *acme.Provider, d domain, mail string) error {
+func requestCert(prov *acme.Provider, d domain) error {
c, err := d.Load()
if err != nil {
c.PrivateKey, err = acme.NewKey(d.KeySize)
@@ -83,7 +83,7 @@ func requestCert(prov *acme.Provider, d domain, mail string) error {
}
log.Println("Request bundle for", d.Altnames)
- cert, err := prov.Bundle(c.PrivateKey, d.Altnames, mail)
+ cert, err := prov.Bundle(c.PrivateKey, d.Altnames)
if err != nil {
return err
}
@@ -137,7 +137,7 @@ func main() {
}
for _, dom := range d.Domain {
- if err := requestCert(prov, dom, d.Mail); err != nil {
+ if err := requestCert(prov, dom); err != nil {
log.Fatal(err)
}
}
diff --git a/cmd/batch/main.go b/cmd/batch/main.go
index 58f437e..a637fe2 100644
--- a/cmd/batch/main.go
+++ b/cmd/batch/main.go
@@ -36,11 +36,7 @@ func main() {
log.Println("Skip", c)
continue
}
- mail := acme.GetMail(c.Leaf)
- if mail == "" {
- continue
- }
- csr, err := acme.NewCSR(c.PrivateKey, c.Leaf.DNSNames, mail)
+ csr, err := acme.NewCSR(c.PrivateKey, c.Leaf.DNSNames)
if err != nil {
log.Println(err)
continue
@@ -81,7 +77,7 @@ func main() {
}
log.Println("Request bundle for", *domains)
- cert, err := prov.Bundle(key, *domains, *email)
+ cert, err := prov.Bundle(key, *domains)
if err != nil {
log.Fatal(err)
}