Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-13 22:51:08 -05:00
Code Issues Activity

gofmt!

Browse source
This commit is contained in:
Matthew Holt 2016-03-17 16:43:50 -06:00
parent 37d050922b
commit b9f8c183fa
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
caddy/https/crypto.go
View file

@ -18,7 +18,7 @@ func loadPrivateKey(file string) (crypto.PrivateKey, error) {
return nil, err return nil, err
} }
keyBlock, _ := pem.Decode(keyBytes) keyBlock, _ := pem.Decode(keyBytes)
switch keyBlock.Type { switch keyBlock.Type {
case "RSA PRIVATE KEY": case "RSA PRIVATE KEY":
return x509.ParsePKCS1PrivateKey(keyBlock.Bytes) return x509.ParsePKCS1PrivateKey(keyBlock.Bytes)
@ -45,7 +45,7 @@ func savePrivateKey(key crypto.PrivateKey, file string) error {
pemType = "RSA" pemType = "RSA"
keyBytes = x509.MarshalPKCS1PrivateKey(key) keyBytes = x509.MarshalPKCS1PrivateKey(key)
} }
pemKey := pem.Block{Type: pemType + " PRIVATE KEY", Bytes: keyBytes} pemKey := pem.Block{Type: pemType + " PRIVATE KEY", Bytes: keyBytes}
keyOut, err := os.Create(file) keyOut, err := os.Create(file)
if err != nil { if err != nil {

6
caddy/https/crypto_test.go
View file

@ -88,9 +88,9 @@ func TestSaveAndLoadECCPrivateKey(t *testing.T) {
} }
// verify loaded key is correct // verify loaded key is correct
if !PrivateKeysSame(privateKey, loadedKey) { if !PrivateKeysSame(privateKey, loadedKey) {
t.Error("Expected key bytes to be the same, but they weren't") t.Error("Expected key bytes to be the same, but they weren't")
} }
} }
// PrivateKeysSame compares the bytes of a and b and returns true if they are the same. // PrivateKeysSame compares the bytes of a and b and returns true if they are the same.