diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-08 12:29:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-08 12:29:01 (GMT) |
| commit | c96788a1bfca0701311e867a6e6b09c87593f917 (patch) | |
| tree | 863b5a6282a2e2fcde1d7a85bb704d6b3f4556ad /src/network | |
| parent | b794652b4cc3b71f7d7b83ee72fb8ab4d588cdba (diff) | |
| parent | e1d6df4e5931ee49b4b68dd5a33146f5639268b7 (diff) | |
| download | Qt-c96788a1bfca0701311e867a6e6b09c87593f917.zip Qt-c96788a1bfca0701311e867a6e6b09c87593f917.tar.gz Qt-c96788a1bfca0701311e867a6e6b09c87593f917.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
SSL: blacklist intermediate certificates that issued weak certs
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 2a2ad55..85cd06c 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -814,6 +814,9 @@ static const char *certificate_blacklist[] = { // "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust + + "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust + "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust 0 }; |