Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
859a93d2
Commit
859a93d2
authored
Apr 04, 2016
by
Eldin Hadzic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for #721
parent
a14fce0b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
caddy/https/https.go
caddy/https/https.go
+1
-1
caddy/https/setup.go
caddy/https/setup.go
+0
-4
caddy/https/setup_test.go
caddy/https/setup_test.go
+5
-0
No files found.
caddy/https/https.go
View file @
859a93d2
...
...
@@ -404,7 +404,7 @@ const AlternatePort = "5033"
// KeyType is the type to use for new keys.
// This shouldn't need to change except for in tests;
// the size can be drastically reduced for speed.
var
KeyType
acme
.
KeyType
var
KeyType
=
acme
.
RSA2048
// stopChan is used to signal the maintenance goroutine
// to terminate.
...
...
caddy/https/setup.go
View file @
859a93d2
...
...
@@ -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
// does not equal localhost.
func
setDefaultTLSParams
(
c
*
server
.
Config
)
{
if
KeyType
==
""
{
KeyType
=
acme
.
RSA2048
}
// If no ciphers provided, use default list
if
len
(
c
.
TLS
.
Ciphers
)
==
0
{
c
.
TLS
.
Ciphers
=
defaultCiphers
...
...
caddy/https/setup_test.go
View file @
859a93d2
...
...
@@ -55,6 +55,11 @@ func TestSetupParseBasic(t *testing.T) {
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
expectedCiphers
:=
[]
uint16
{
tls
.
TLS_FALLBACK_SCSV
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment