diff options
| -rw-r--r-- | load_private_key.go | 13 | ||||
| -rw-r--r-- | pem.go | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/load_private_key.go b/load_private_key.go index 4678862..e2a590e 100644 --- a/load_private_key.go +++ b/load_private_key.go @@ -27,27 +27,24 @@ func loadPrivateKey(path string) (pki.PrivateKey, error) { pems, err := parseFile(file) if err != nil { - return nil, err + return nil, fmt.Errorf("could not load private key: %s", err) } if len(pems) > 1 { return nil, fmt.Errorf("more than one object in file") } - var pk pki.PrivateKey for key, parts := range pems { if len(parts) > 1 { return nil, fmt.Errorf("more than one object found") } switch key { case pki.PemLabelRsa: - pk, err = pki.LoadPrivateKeyRsa(parts[0]) + return pki.LoadPrivateKeyRsa(parts[0]) case pki.PemLabelEd25519: - pk, err = pki.LoadPrivateKeyEd25519(parts[0]) + return pki.LoadPrivateKeyEd25519(parts[0]) case pki.PemLabelEcdsa: - pk, err = pki.LoadPrivateKeyEcdsa(parts[0]) - default: - return nil, fmt.Errorf("unknown private key format %s", key) + return pki.LoadPrivateKeyEcdsa(parts[0]) } } - return pk, err + return nil, fmt.Errorf("no private key found in file '%s'", path) } @@ -35,6 +35,9 @@ func parseFile(file io.Reader) (pemMap, error) { if err != nil { return nil, err } + if len(raw) == 0 { + return nil, fmt.Errorf("file is empty") + } return parsePem(raw) } |