Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-11-03 19:17:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #723 from mholt/fix-#721

Browse Source 
Fix for #721
This commit is contained in:
elcore 2016-04-05 04:54:49 +02:00
commit 987a5f98c4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caddy/https/https.go
View File

@ -404,7 +404,7 @@ const AlternatePort = "5033"
// KeyType is the type to use for new keys. // KeyType is the type to use for new keys.
// This shouldn't need to change except for in tests; // This shouldn't need to change except for in tests;
// the size can be drastically reduced for speed. // the size can be drastically reduced for speed.
var KeyType acme.KeyType var KeyType = acme.RSA2048
// stopChan is used to signal the maintenance goroutine // stopChan is used to signal the maintenance goroutine
// to terminate. // to terminate.

4
caddy/https/setup.go
View File

@ -228,10 +228,6 @@ func loadCertsInDir(c *setup.Controller, dir string) error {
// port to 443 if not already set, TLS is enabled, TLS is manual, and the host // port to 443 if not already set, TLS is enabled, TLS is manual, and the host
// does not equal localhost. // does not equal localhost.
func setDefaultTLSParams(c *server.Config) { func setDefaultTLSParams(c *server.Config) {
if KeyType == "" {
KeyType = acme.RSA2048
}
// If no ciphers provided, use default list // If no ciphers provided, use default list
if len(c.TLS.Ciphers) == 0 { if len(c.TLS.Ciphers) == 0 {
c.TLS.Ciphers = defaultCiphers c.TLS.Ciphers = defaultCiphers

5
caddy/https/setup_test.go
View File

@ -55,6 +55,11 @@ func TestSetupParseBasic(t *testing.T) {
t.Errorf("Expected 'tls1.2 (0x0303)' as ProtocolMaxVersion, got %v", c.TLS.ProtocolMaxVersion) t.Errorf("Expected 'tls1.2 (0x0303)' as ProtocolMaxVersion, got %v", c.TLS.ProtocolMaxVersion)
} }
// KeyType default
if KeyType != acme.RSA2048 {
t.Errorf("Expected '2048' as KeyType, got %#v", KeyType)
}
// Cipher checks // Cipher checks
expectedCiphers := []uint16{ expectedCiphers := []uint16{
tls.TLS_FALLBACK_SCSV, tls.TLS_FALLBACK_SCSV,