Skip to content

Commit 2b2e352

Browse files
authored
Merge pull request #8 from rosahaj/master
Use Config struct instead of passing values to generateCertificate
2 parents 6c5576d + 064f71b commit 2b2e352

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

cert.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212
)
1313

14-
func generateCertificate(certPath, keyPath string) error {
14+
func generateCertificate() error {
1515
priv, err := rsa.GenerateKey(rand.Reader, 2048)
1616
if err != nil {
1717
return err
@@ -35,14 +35,14 @@ func generateCertificate(certPath, keyPath string) error {
3535
return err
3636
}
3737

38-
certOut, err := os.Create(certPath)
38+
certOut, err := os.Create(Config.Cert)
3939
if err != nil {
4040
return err
4141
}
4242
defer certOut.Close()
4343
pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
4444

45-
keyOut, err := os.OpenFile(keyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
45+
keyOut, err := os.OpenFile(Config.Key, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
4646
if err != nil {
4747
return err
4848
}

proxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func main() {
169169
}
170170

171171
log.Println("cert and key do not exist, generating")
172-
generateCertificate(Config.Cert, Config.Key)
172+
generateCertificate()
173173
}
174174

175175
server := &http.Server{

0 commit comments

Comments
 (0)