1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SecureTransport: Set requested ciphers specified in the configuration

Browse Source 
Fixes: QTBUG-83491
Change-Id: I783a355be5405d4c44e703874bdf2e14afe629e1
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Andy Shaw 2020-04-17 10:32:56 +02:00
parent b9cd399dc9
commit c70d693378
2 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/network/ssl/qsslsocket_mac.cpp
View File

@ -854,6 +854,84 @@ QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSLCipherSuite(SSLCipherSui
}
return ciph;
}
SSLCipherSuite QSslSocketBackendPrivate::SSLCipherSuite_from_QSslCipher(const QSslCipher &ciph)
{
if (ciph.d->name == QLatin1String("AES128-SHA"))
return TLS_RSA_WITH_AES_128_CBC_SHA;
if (ciph.d->name == QLatin1String("DHE-RSA-AES128-SHA"))
return TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
if (ciph.d->name == QLatin1String("AES256-SHA"))
return TLS_RSA_WITH_AES_256_CBC_SHA;
if (ciph.d->name == QLatin1String("DHE-RSA-AES256-SHA"))
return TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-NULL-SHA"))
return TLS_ECDH_ECDSA_WITH_NULL_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-RC4-SHA"))
return TLS_ECDH_ECDSA_WITH_RC4_128_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-DES-CBC3-SHA"))
return TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-AES128-SHA"))
return TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-AES256-SHA"))
return TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-RC4-SHA"))
return TLS_ECDHE_ECDSA_WITH_RC4_128_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-DES-CBC3-SHA"))
return TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-AES128-SHA"))
return TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-AES256-SHA"))
return TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-NULL-SHA"))
return TLS_ECDH_RSA_WITH_NULL_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-RC4-SHA"))
return TLS_ECDH_RSA_WITH_RC4_128_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-DES-CBC3-SHA"))
return TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-AES128-SHA"))
return TLS_ECDH_RSA_WITH_AES_128_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-AES256-SHA"))
return TLS_ECDH_RSA_WITH_AES_256_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-RC4-SHA"))
return TLS_ECDHE_RSA_WITH_RC4_128_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-DES-CBC3-SHA"))
return TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-AES128-SHA"))
return TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA;
if (ciph.d->name == QLatin1String("ECDH-RSA-AES256-SHA"))
return TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA;
if (ciph.d->name == QLatin1String("DES-CBC3-SHA"))
return TLS_RSA_WITH_3DES_EDE_CBC_SHA;
if (ciph.d->name == QLatin1String("AES128-SHA256"))
return TLS_RSA_WITH_AES_128_CBC_SHA256;
if (ciph.d->name == QLatin1String("AES256-SHA256"))
return TLS_RSA_WITH_AES_256_CBC_SHA256;
if (ciph.d->name == QLatin1String("DHE-RSA-DES-CBC3-SHA"))
return TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA;
if (ciph.d->name == QLatin1String("DHE-RSA-AES128-SHA256"))
return TLS_DHE_RSA_WITH_AES_128_CBC_SHA256;
if (ciph.d->name == QLatin1String("DHE-RSA-AES256-SHA256"))
return TLS_DHE_RSA_WITH_AES_256_CBC_SHA256;
if (ciph.d->name == QLatin1String("AES256-GCM-SHA384"))
return TLS_RSA_WITH_AES_256_GCM_SHA384;
if (ciph.d->name == QLatin1String("ECDHE-ECDSA-AES128-SHA256"))
return TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256;
if (ciph.d->name == QLatin1String("ECDHE-ECDSA-AES256-SHA384"))
return TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-AES128-SHA256"))
return TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256;
if (ciph.d->name == QLatin1String("ECDH-ECDSA-AES256-SHA384"))
return TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384;
if (ciph.d->name == QLatin1String("ECDHE-RSA-AES128-SHA256"))
return TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256;
if (ciph.d->name == QLatin1String("ECDHE-RSA-AES256-SHA384"))
return TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384;
if (ciph.d->name == QLatin1String("ECDHE-RSA-AES256-SHA384"))
return TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256;
if (ciph.d->name == QLatin1String("ECDHE-RSA-AES256-GCM-SHA384"))
return TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384;
return 0;
}
bool QSslSocketBackendPrivate::initSslContext()
{
@ -969,6 +1047,22 @@ bool QSslSocketBackendPrivate::initSslContext()
SSLSetDiffieHellmanParams(context, dhparam, sizeof(dhparam));
#endif
}
if (configuration.ciphers.size() > 0) {
QVector<SSLCipherSuite> cfCiphers;
for (const QSslCipher &cipher : configuration.ciphers) {
if (auto sslCipher = QSslSocketBackendPrivate::SSLCipherSuite_from_QSslCipher(cipher))
cfCiphers << sslCipher;
}
if (cfCiphers.size() == 0) {
qCWarning(lcSsl) << "failed to add any of the requested ciphers from the configuration";
return false;
}
OSStatus err = SSLSetEnabledCiphers(context, cfCiphers.data(), cfCiphers.size());
if (err != errSecSuccess) {
qCWarning(lcSsl) << "failed to set the ciphers from the configuration";
return false;
}
}
return true;
}

1
src/network/ssl/qsslsocket_mac_p.h
View File

@ -104,6 +104,7 @@ public:
const QByteArray &passPhrase);
static QSslCipher QSslCipher_from_SSLCipherSuite(SSLCipherSuite cipher);
static SSLCipherSuite SSLCipherSuite_from_QSslCipher(const QSslCipher &cipher);
private:
// SSL context management/properties: