diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-02 14:55:00 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-18 12:33:50 +0100 |
| commit | 0352cf8e1bf57615b9faf3f6f383896444e762ac (patch) | |
| tree | 1be2389fc0bda4ed0d98bdf072651509ef2f9958 /src/network/ssl/qtlskey_openssl.cpp | |
| parent | 36017b089439e22adda55e039e9a91346feff223 (diff) | |
Port QSslKey to the new plugin-based implementation
The idea is to have QSslKey(Private) backend-neutral and hide
all library-specific code inside plugins.
Pick-to: dev
Fixes: QTBUG-90953
Task-number: QTBUG-65922
Change-Id: I2eeee3b2b72c78c2e24f2fb914abce3caa913be8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qtlskey_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qtlskey_openssl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/network/ssl/qtlskey_openssl.cpp b/src/network/ssl/qtlskey_openssl.cpp index 6517be2d76..c649d57f19 100644 --- a/src/network/ssl/qtlskey_openssl.cpp +++ b/src/network/ssl/qtlskey_openssl.cpp @@ -401,28 +401,28 @@ QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, int i = 0, len = 0; switch (cipher) { - case QSslKeyPrivate::DesCbc: + case QSsl::Cipher::DesCbc: #ifndef OPENSSL_NO_DES type = q_EVP_des_cbc(); #endif break; - case QSslKeyPrivate::DesEde3Cbc: + case QSsl::Cipher::DesEde3Cbc: #ifndef OPENSSL_NO_DES type = q_EVP_des_ede3_cbc(); #endif break; - case QSslKeyPrivate::Rc2Cbc: + case QSsl::Cipher::Rc2Cbc: #ifndef OPENSSL_NO_RC2 type = q_EVP_rc2_cbc(); #endif break; - case QSslKeyPrivate::Aes128Cbc: + case QSsl::Cipher::Aes128Cbc: type = q_EVP_aes_128_cbc(); break; - case QSslKeyPrivate::Aes192Cbc: + case QSsl::Cipher::Aes192Cbc: type = q_EVP_aes_192_cbc(); break; - case QSslKeyPrivate::Aes256Cbc: + case QSsl::Cipher::Aes256Cbc: type = q_EVP_aes_256_cbc(); break; } @@ -437,7 +437,7 @@ QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, q_EVP_CIPHER_CTX_reset(ctx); q_EVP_CipherInit(ctx, type, nullptr, nullptr, enc); q_EVP_CIPHER_CTX_set_key_length(ctx, key.size()); - if (cipher == QSslKeyPrivate::Rc2Cbc) + if (cipher == QSsl::Cipher::Rc2Cbc) q_EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), nullptr); q_EVP_CipherInit_ex(ctx, nullptr, nullptr, |