From 5ff7cdbac856934f08a5d3aea334add393050d30 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 26 Jan 2022 14:47:50 +0300 Subject: [PATCH] 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 Date: Wed Jan 26 14:41:04 2022 +0300 all: fix chlog, imp --- CHANGELOG.md | 2 +- internal/aghtls/aghtls.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8d30018..12e6edf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,7 +63,7 @@ In this release, the schema version has changed from 12 to 13. ### Security - 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 [#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993 diff --git a/internal/aghtls/aghtls.go b/internal/aghtls/aghtls.go index 89de2524..5dc7a382 100644 --- a/internal/aghtls/aghtls.go +++ b/internal/aghtls/aghtls.go @@ -6,8 +6,7 @@ import "crypto/tls" // SaferCipherSuites returns a set of default cipher suites with vulnerable and // weak cipher suites removed. func SaferCipherSuites() (safe []uint16) { - suites := tls.CipherSuites() - for _, s := range suites { + for _, s := range tls.CipherSuites() { switch s.ID { case tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,