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-19 11:57:05 +0100 |
commit | 43d933bf5095170aef1f8223d333a13ea07c3031 (patch) | |
tree | 425331de13b19166f784c8c5e27b3e45eb09bfe3 /src/network/ssl/qtlskey_st.cpp | |
parent | 9385e5407102240555ea1c18871f9adbff600afa (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.
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>
(cherry picked from commit 0352cf8e1bf57615b9faf3f6f383896444e762ac)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qtlskey_st.cpp')
-rw-r--r-- | src/network/ssl/qtlskey_st.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/network/ssl/qtlskey_st.cpp b/src/network/ssl/qtlskey_st.cpp index e4616c5167..71ef33ff20 100644 --- a/src/network/ssl/qtlskey_st.cpp +++ b/src/network/ssl/qtlskey_st.cpp @@ -60,21 +60,21 @@ QByteArray wrapCCCrypt(CCOperation ccOp, QSslKeyPrivate::Cipher cipher, int blockSize = {}; CCAlgorithm ccAlgorithm = {}; switch (cipher) { - case QSslKeyPrivate::DesCbc: + case Cipher::DesCbc: blockSize = kCCBlockSizeDES; ccAlgorithm = kCCAlgorithmDES; break; - case QSslKeyPrivate::DesEde3Cbc: + case Cipher::DesEde3Cbc: blockSize = kCCBlockSize3DES; ccAlgorithm = kCCAlgorithm3DES; break; - case QSslKeyPrivate::Rc2Cbc: + case Cipher::Rc2Cbc: blockSize = kCCBlockSizeRC2; ccAlgorithm = kCCAlgorithmRC2; break; - case QSslKeyPrivate::Aes128Cbc: - case QSslKeyPrivate::Aes192Cbc: - case QSslKeyPrivate::Aes256Cbc: + case Cipher::Aes128Cbc: + case Cipher::Aes192Cbc: + case Cipher::Aes256Cbc: blockSize = kCCBlockSizeAES128; ccAlgorithm = kCCAlgorithmAES; break; @@ -93,13 +93,13 @@ QByteArray wrapCCCrypt(CCOperation ccOp, QSslKeyPrivate::Cipher cipher, } // Unnamed namespace. -QByteArray TlsKeySecureTransport::decrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, +QByteArray TlsKeySecureTransport::decrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv) const { return wrapCCCrypt(kCCDecrypt, cipher, data, key, iv); } -QByteArray TlsKeySecureTransport::encrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, +QByteArray TlsKeySecureTransport::encrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv) const { return wrapCCCrypt(kCCEncrypt, cipher, data, key, iv); |