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
Łukasz Nowak
caddy
Commits
197297b0
Commit
197297b0
authored
Feb 23, 2016
by
Matt Holt
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #628 from elcore/master
tls: Add SHA384 ciphers
parents
c12847e5
a541eb78
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
caddy/https/setup.go
caddy/https/setup.go
+6
-0
caddy/https/setup_test.go
caddy/https/setup_test.go
+3
-1
No files found.
caddy/https/setup.go
View file @
197297b0
...
...
@@ -268,6 +268,8 @@ var supportedProtocols = map[string]uint16{
//
// This map, like any map, is NOT ORDERED. Do not range over this map.
var
supportedCiphersMap
=
map
[
string
]
uint16
{
"ECDHE-RSA-AES256-GCM-SHA384"
:
tls
.
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
,
"ECDHE-ECDSA-AES256-GCM-SHA384"
:
tls
.
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
,
"ECDHE-RSA-AES128-GCM-SHA256"
:
tls
.
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
,
"ECDHE-ECDSA-AES128-GCM-SHA256"
:
tls
.
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
,
"ECDHE-RSA-AES128-CBC-SHA"
:
tls
.
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
,
...
...
@@ -287,6 +289,8 @@ var supportedCiphersMap = map[string]uint16{
// Note that TLS_FALLBACK_SCSV is not in this list since it is always
// added manually.
var
supportedCiphers
=
[]
uint16
{
tls
.
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
,
tls
.
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
,
tls
.
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
,
tls
.
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
,
tls
.
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
,
...
...
@@ -301,6 +305,8 @@ var supportedCiphers = []uint16{
// List of all the ciphers we want to use by default
var
defaultCiphers
=
[]
uint16
{
tls
.
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
,
tls
.
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
,
tls
.
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
,
tls
.
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
,
tls
.
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
,
...
...
caddy/https/setup_test.go
View file @
197297b0
...
...
@@ -57,6 +57,8 @@ func TestSetupParseBasic(t *testing.T) {
// Cipher checks
expectedCiphers
:=
[]
uint16
{
tls
.
TLS_FALLBACK_SCSV
,
tls
.
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
,
tls
.
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
,
tls
.
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
,
tls
.
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
,
tls
.
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
,
...
...
@@ -97,7 +99,7 @@ func TestSetupParseIncompleteParams(t *testing.T) {
func
TestSetupParseWithOptionalParams
(
t
*
testing
.
T
)
{
params
:=
`tls `
+
certFile
+
` `
+
keyFile
+
` {
protocols ssl3.0 tls1.2
ciphers RSA-
3DES-EDE-CBC-SHA RSA-AES256-CBC-SHA ECDHE-RSA-AES128-GCM-SHA256
ciphers RSA-
AES256-CBC-SHA ECDHE-RSA-AES128-GCM-SHA256 ECDHE-ECDSA-AES256-GCM-SHA384
}`
c
:=
setup
.
NewTestController
(
params
)
...
...
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