jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crypto.hpp: replaced size_t with std::size_t

Browse source
This commit is contained in:
eidheim 2017-10-29 09:40:50 +01:00
commit 68f047ce8f
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
crypto.hpp
View file

@ -22,7 +22,7 @@ namespace SimpleWeb {
#endif #endif
class Crypto { class Crypto {
const static size_t buffer_size = 131072; const static std::size_t buffer_size = 131072;
public: public:
class Base64 { class Base64 {
@ -40,7 +40,7 @@ namespace SimpleWeb {
BIO_set_mem_buf(b64, bptr, BIO_CLOSE); BIO_set_mem_buf(b64, bptr, BIO_CLOSE);
// Write directly to base64-buffer to avoid copy // Write directly to base64-buffer to avoid copy
auto base64_length = static_cast<size_t>(round(4 * ceil(static_cast<double>(ascii.size()) / 3.0))); auto base64_length = static_cast<std::size_t>(round(4 * ceil(static_cast<double>(ascii.size()) / 3.0)));
base64.resize(base64_length); base64.resize(base64_length);
bptr->length = 0; bptr->length = 0;
bptr->max = base64_length + 1; bptr->max = base64_length + 1;
@ -73,7 +73,7 @@ namespace SimpleWeb {
auto decoded_length = BIO_read(bio, &ascii[0], static_cast<int>(ascii.size())); auto decoded_length = BIO_read(bio, &ascii[0], static_cast<int>(ascii.size()));
if(decoded_length > 0) if(decoded_length > 0)
ascii.resize(static_cast<size_t>(decoded_length)); ascii.resize(static_cast<std::size_t>(decoded_length));
else else
ascii.clear(); ascii.clear();
@ -92,117 +92,117 @@ namespace SimpleWeb {
return hex_stream.str(); return hex_stream.str();
} }
static std::string md5(const std::string &input, size_t iterations = 1) noexcept { static std::string md5(const std::string &input, std::size_t iterations = 1) noexcept {
std::string hash; std::string hash;
hash.resize(128 / 8); hash.resize(128 / 8);
MD5(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0])); MD5(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0]));
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
MD5(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); MD5(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
} }
static std::string md5(std::istream &stream, size_t iterations = 1) noexcept { static std::string md5(std::istream &stream, std::size_t iterations = 1) noexcept {
MD5_CTX context; MD5_CTX context;
MD5_Init(&context); MD5_Init(&context);
std::streamsize read_length; std::streamsize read_length;
std::vector<char> buffer(buffer_size); std::vector<char> buffer(buffer_size);
while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0) while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0)
MD5_Update(&context, buffer.data(), static_cast<size_t>(read_length)); MD5_Update(&context, buffer.data(), static_cast<std::size_t>(read_length));
std::string hash; std::string hash;
hash.resize(128 / 8); hash.resize(128 / 8);
MD5_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context); MD5_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context);
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
MD5(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); MD5(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
} }
static std::string sha1(const std::string &input, size_t iterations = 1) noexcept { static std::string sha1(const std::string &input, std::size_t iterations = 1) noexcept {
std::string hash; std::string hash;
hash.resize(160 / 8); hash.resize(160 / 8);
SHA1(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA1(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0]));
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
SHA1(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA1(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
} }
static std::string sha1(std::istream &stream, size_t iterations = 1) noexcept { static std::string sha1(std::istream &stream, std::size_t iterations = 1) noexcept {
SHA_CTX context; SHA_CTX context;
SHA1_Init(&context); SHA1_Init(&context);
std::streamsize read_length; std::streamsize read_length;
std::vector<char> buffer(buffer_size); std::vector<char> buffer(buffer_size);
while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0) while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0)
SHA1_Update(&context, buffer.data(), static_cast<size_t>(read_length)); SHA1_Update(&context, buffer.data(), static_cast<std::size_t>(read_length));
std::string hash; std::string hash;
hash.resize(160 / 8); hash.resize(160 / 8);
SHA1_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context); SHA1_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context);
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
SHA1(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA1(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
} }
static std::string sha256(const std::string &input, size_t iterations = 1) noexcept { static std::string sha256(const std::string &input, std::size_t iterations = 1) noexcept {
std::string hash; std::string hash;
hash.resize(256 / 8); hash.resize(256 / 8);
SHA256(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA256(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0]));
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
SHA256(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA256(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
} }
static std::string sha256(std::istream &stream, size_t iterations = 1) noexcept { static std::string sha256(std::istream &stream, std::size_t iterations = 1) noexcept {
SHA256_CTX context; SHA256_CTX context;
SHA256_Init(&context); SHA256_Init(&context);
std::streamsize read_length; std::streamsize read_length;
std::vector<char> buffer(buffer_size); std::vector<char> buffer(buffer_size);
while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0) while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0)
SHA256_Update(&context, buffer.data(), static_cast<size_t>(read_length)); SHA256_Update(&context, buffer.data(), static_cast<std::size_t>(read_length));
std::string hash; std::string hash;
hash.resize(256 / 8); hash.resize(256 / 8);
SHA256_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context); SHA256_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context);
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
SHA256(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA256(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
} }
static std::string sha512(const std::string &input, size_t iterations = 1) noexcept { static std::string sha512(const std::string &input, std::size_t iterations = 1) noexcept {
std::string hash; std::string hash;
hash.resize(512 / 8); hash.resize(512 / 8);
SHA512(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA512(reinterpret_cast<const unsigned char *>(&input[0]), input.size(), reinterpret_cast<unsigned char *>(&hash[0]));
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
SHA512(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA512(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
} }
static std::string sha512(std::istream &stream, size_t iterations = 1) noexcept { static std::string sha512(std::istream &stream, std::size_t iterations = 1) noexcept {
SHA512_CTX context; SHA512_CTX context;
SHA512_Init(&context); SHA512_Init(&context);
std::streamsize read_length; std::streamsize read_length;
std::vector<char> buffer(buffer_size); std::vector<char> buffer(buffer_size);
while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0) while((read_length = stream.read(&buffer[0], buffer_size).gcount()) > 0)
SHA512_Update(&context, buffer.data(), static_cast<size_t>(read_length)); SHA512_Update(&context, buffer.data(), static_cast<std::size_t>(read_length));
std::string hash; std::string hash;
hash.resize(512 / 8); hash.resize(512 / 8);
SHA512_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context); SHA512_Final(reinterpret_cast<unsigned char *>(&hash[0]), &context);
for(size_t c = 1; c < iterations; ++c) for(std::size_t c = 1; c < iterations; ++c)
SHA512(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0])); SHA512(reinterpret_cast<const unsigned char *>(&hash[0]), hash.size(), reinterpret_cast<unsigned char *>(&hash[0]));
return hash; return hash;
@ -211,7 +211,7 @@ namespace SimpleWeb {
/// key_size is number of bytes of the returned key. /// key_size is number of bytes of the returned key.
static std::string pbkdf2(const std::string &password, const std::string &salt, int iterations, int key_size) noexcept { static std::string pbkdf2(const std::string &password, const std::string &salt, int iterations, int key_size) noexcept {
std::string key; std::string key;
key.resize(static_cast<size_t>(key_size)); key.resize(static_cast<std::size_t>(key_size));
PKCS5_PBKDF2_HMAC_SHA1(password.c_str(), password.size(), PKCS5_PBKDF2_HMAC_SHA1(password.c_str(), password.size(),
reinterpret_cast<const unsigned char *>(salt.c_str()), salt.size(), iterations, reinterpret_cast<const unsigned char *>(salt.c_str()), salt.size(), iterations,
key_size, reinterpret_cast<unsigned char *>(&key[0])); key_size, reinterpret_cast<unsigned char *>(&key[0]));