diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-03-06 10:16:43 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-03-07 02:56:32 +0000 |
| commit | 1af234f24e1bdf5812f5b7addb5c83094b00a1bf (patch) | |
| tree | 97882af76bb8bb03c4be5c5152dc8d85f1c39eb7 /src/network/ssl/qsslkey_mac.cpp | |
| parent | ef840bef5c436a27ac69b063c548c35b00048ac5 (diff) | |
QSslKey - clean up the code a bit (SecureTransport)
To get rid of different warnings (visible in qt-creator at least).
Change-Id: Ic7b57cbd56494704eda3f0616fcd901a8fab63db
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslkey_mac.cpp')
| -rw-r--r-- | src/network/ssl/qsslkey_mac.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/network/ssl/qsslkey_mac.cpp b/src/network/ssl/qsslkey_mac.cpp index d460cbfdab..b0f726a2e6 100644 --- a/src/network/ssl/qsslkey_mac.cpp +++ b/src/network/ssl/qsslkey_mac.cpp @@ -42,7 +42,9 @@ #include <CommonCrypto/CommonCrypto.h> -QT_USE_NAMESPACE +#include <cstddef> + +QT_BEGIN_NAMESPACE static QByteArray wrapCCCrypt(CCOperation ccOp, QSslKeyPrivate::Cipher cipher, @@ -69,12 +71,12 @@ static QByteArray wrapCCCrypt(CCOperation ccOp, QByteArray plain(data.size() + blockSize, 0); CCCryptorStatus status = CCCrypt( ccOp, ccAlgorithm, kCCOptionPKCS7Padding, - key.constData(), key.size(), + key.constData(), std::size_t(key.size()), iv.constData(), - data.constData(), data.size(), - plain.data(), plain.size(), &plainLength); + data.constData(), std::size_t(data.size()), + plain.data(), std::size_t(plain.size()), &plainLength); if (status == kCCSuccess) - return plain.left(plainLength); + return plain.left(int(plainLength)); return QByteArray(); } @@ -87,3 +89,5 @@ QByteArray QSslKeyPrivate::encrypt(Cipher cipher, const QByteArray &data, const { return wrapCCCrypt(kCCEncrypt, cipher, data, key, iv); } + +QT_END_NAMESPACE |