|
|
@@ -124,7 +124,16 @@ func LoadX509KeyPair(certFile string, keyFile string) (cert Certificate, err os. |
|
|
|
if err != nil { |
|
|
|
return |
|
|
|
} |
|
|
|
keyPEMBlock, err := ioutil.ReadFile(keyFile) |
|
|
|
if err != nil { |
|
|
|
return |
|
|
|
} |
|
|
|
return X509KeyPair(certPEMBlock, keyPEMBlock) |
|
|
|
} |
|
|
|
|
|
|
|
// X509KeyPair parses a public/private key pair from a pair of |
|
|
|
// PEM encoded data. |
|
|
|
func X509KeyPair(certPEMBlock, keyPEMBlock []byte) (cert Certificate, err os.Error) { |
|
|
|
var certDERBlock *pem.Block |
|
|
|
for { |
|
|
|
certDERBlock, certPEMBlock = pem.Decode(certPEMBlock) |
|
|
@@ -141,11 +150,6 @@ func LoadX509KeyPair(certFile string, keyFile string) (cert Certificate, err os. |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
keyPEMBlock, err := ioutil.ReadFile(keyFile) |
|
|
|
if err != nil { |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
keyDERBlock, _ := pem.Decode(keyPEMBlock) |
|
|
|
if keyDERBlock == nil { |
|
|
|
err = os.ErrorString("crypto/tls: failed to parse key PEM data") |
|
|
|