summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-12-23 22:44:13 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-23 22:44:13 +0100
commitd776937df91e46536f404c6868d64016b6038d7b (patch)
treedde5a5ab39d27a5b0bc3327127c7d6dd1b1ae5f8 /src/network
parente14503d353de7246a1d6e36894dd77bb32c4af3b (diff)
parent3f3be55835427ea9f1bbcc046e05ee538ca214d7 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qsslcertificate.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 286a6fd668..b4c593fa73 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -1214,6 +1214,8 @@ static const char *certificate_blacklist[] = {
"08:27", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate
"08:64", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate
+
+ "03:1d:a7", "AC DG Tr\xC3\xA9sor SSL", // intermediate certificate linking back to ANSSI French National Security Agency
0
};