aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/batch/files.go3
-rw-r--r--crypto.go13
2 files changed, 12 insertions, 4 deletions
diff --git a/cmd/batch/files.go b/cmd/batch/files.go
index 474d0ff..371b856 100644
--- a/cmd/batch/files.go
+++ b/cmd/batch/files.go
@@ -1,6 +1,7 @@
package main
import (
+ "crypto"
"crypto/tls"
"crypto/x509"
"fmt"
@@ -17,6 +18,8 @@ type Cert struct {
tls.Certificate
keyFile string
crtFile string
+ accFile string
+ crypto.PrivateKey
}
func (c Cert) String() string {
diff --git a/crypto.go b/crypto.go
index d7b3b10..e3be942 100644
--- a/crypto.go
+++ b/crypto.go
@@ -88,11 +88,16 @@ func NewKey(size int) (crypto.PrivateKey, error) {
return ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
case 521:
return ecdsa.GenerateKey(elliptic.P521(), rand.Reader)
+ case 1024:
+ return rsa.GenerateKey(rand.Reader, 1024)
+ case 1536:
+ return rsa.GenerateKey(rand.Reader, 1536)
+ case 2048:
+ return rsa.GenerateKey(rand.Reader, 2048)
+ case 4096:
+ return rsa.GenerateKey(rand.Reader, 4096)
default:
- if size < 1024 {
- return nil, ErrKeySize
- }
- return rsa.GenerateKey(rand.Reader, size)
+ return nil, ErrKeySize
}
}