a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: all: fix chlog, imp 

Merge in DNS/adguard-home from fix-chlog to master

Squashed commit of the following:

commit e69da2f574923b95ac3d0fa9057fffe2a716b5be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 26 14:41:04 2022 +0300

    all: fix chlog, imp
This commit is contained in:
Ainar Garipov 2022-01-26 14:47:50 +03:00
parent 504c54ab0e
commit 5ff7cdbac8
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -63,7 +63,7 @@ In this release, the schema version has changed from 12 to 13.
### Security ### Security
- Weaker cipher suites that use the CBC (cipher block chaining) mode of - Weaker cipher suites that use the CBC (cipher block chaining) mode of
operation have been disabled (#2993). operation have been disabled ([#2993]).
[#1730]: https://github.com/AdguardTeam/AdGuardHome/issues/1730 [#1730]: https://github.com/AdguardTeam/AdGuardHome/issues/1730
[#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993 [#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993

3
internal/aghtls/aghtls.go
View File

@ -6,8 +6,7 @@ import "crypto/tls"
// SaferCipherSuites returns a set of default cipher suites with vulnerable and // SaferCipherSuites returns a set of default cipher suites with vulnerable and
// weak cipher suites removed. // weak cipher suites removed.
func SaferCipherSuites() (safe []uint16) { func SaferCipherSuites() (safe []uint16) {
suites := tls.CipherSuites() for _, s := range tls.CipherSuites() {
for _, s := range suites {
switch s.ID { switch s.ID {
case case
tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA, tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,