From 0cdd0a9ff986a070d8b31085516a223b7adef102 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 2 Apr 2017 20:11:30 +0300 Subject: [PATCH] Remove old 'using std::string' from mtproto. --- Telegram/SourceFiles/mtproto/connection.cpp | 2 -- Telegram/SourceFiles/mtproto/rsa_public_key.cpp | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp index 9e1388ff5..b23ed0ac0 100644 --- a/Telegram/SourceFiles/mtproto/connection.cpp +++ b/Telegram/SourceFiles/mtproto/connection.cpp @@ -34,8 +34,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/dc_options.h" #include "mtproto/connection_abstract.h" -using std::string; - namespace MTP { namespace internal { namespace { diff --git a/Telegram/SourceFiles/mtproto/rsa_public_key.cpp b/Telegram/SourceFiles/mtproto/rsa_public_key.cpp index eb37e6daa..96e155902 100644 --- a/Telegram/SourceFiles/mtproto/rsa_public_key.cpp +++ b/Telegram/SourceFiles/mtproto/rsa_public_key.cpp @@ -25,8 +25,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include -using std::string; - namespace MTP { namespace internal { @@ -45,7 +43,7 @@ RSAPublicKey::RSAPublicKey(const char *key) : impl_(new Impl(key)) { int nBytes = BN_num_bytes(impl_->rsa->n); int eBytes = BN_num_bytes(impl_->rsa->e); - string nStr(nBytes, 0), eStr(eBytes, 0); + std::string nStr(nBytes, 0), eStr(eBytes, 0); BN_bn2bin(impl_->rsa->n, (uchar*)&nStr[0]); BN_bn2bin(impl_->rsa->e, (uchar*)&eStr[0]); @@ -65,8 +63,8 @@ bool RSAPublicKey::isValid() const { return impl_->rsa != nullptr; } -bool RSAPublicKey::encrypt(const void *data, string &result) const { - t_assert(isValid()); +bool RSAPublicKey::encrypt(const void *data, std::string &result) const { + Expects(isValid()); result.resize(256); int res = RSA_public_encrypt(256, reinterpret_cast(data), reinterpret_cast(&result[0]), impl_->rsa, RSA_NO_PADDING);