mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Formatting, style fixes

This commit is contained in:
Michał Janiszewski 2016-05-25 10:18:26 +02:00
parent 165ec06690
commit 2d3d889a08
3 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/network/NetworkKey.cpp
View File

@ -24,13 +24,14 @@
#include <openssl/pem.h>
#include <vector>
#define KEY_LENGTH_BITS 2048
#define KEY_TYPE EVP_PKEY_RSA
constexpr int KEY_LENGTH_BITS = 2048;
NetworkKey::NetworkKey()
{
m_ctx = EVP_PKEY_CTX_new_id(KEY_TYPE, NULL);
if (m_ctx == nullptr)
_ctx = EVP_PKEY_CTX_new_id(KEY_TYPE, nullptr);
if (_ctx == nullptr)
{
log_error("Failed to create OpenSSL context");
}
@ -39,49 +40,51 @@ NetworkKey::NetworkKey()
NetworkKey::~NetworkKey()
{
Unload();
if (m_ctx != nullptr)
if (_ctx != nullptr)
{
EVP_PKEY_CTX_free(m_ctx);
m_ctx = nullptr;
EVP_PKEY_CTX_free(_ctx);
_ctx = nullptr;
}
}
void NetworkKey::Unload()
{
if (m_key != nullptr)
if (_key != nullptr)
{
EVP_PKEY_free(m_key);
m_key = nullptr;
EVP_PKEY_free(_key);
_key = nullptr;
}
}
bool NetworkKey::Generate()
{
if (m_ctx == nullptr) {
if (_ctx == nullptr)
{
log_error("Invalid OpenSSL context");
return false;
}
#if KEY_TYPE == EVP_PKEY_RSA
if (!EVP_PKEY_CTX_set_rsa_keygen_bits(m_ctx, KEY_LENGTH_BITS)) {
if (!EVP_PKEY_CTX_set_rsa_keygen_bits(_ctx, KEY_LENGTH_BITS))
{
log_error("Failed to set keygen params");
return false;
}
#else
#error Only RSA is supported!
#endif
if (EVP_PKEY_keygen_init(m_ctx) <= 0)
if (EVP_PKEY_keygen_init(_ctx) <= 0)
{
log_error("Failed to initialise keygen algorithm");
return false;
}
if (EVP_PKEY_keygen(m_ctx, &m_key) <= 0)
if (EVP_PKEY_keygen(_ctx, &_key) <= 0)
{
log_error("Failed to generate new key!");
return false;
}
else
{
log_warning("key ok");
log_verbose("Key successfully generated");
}
log_verbose("New key of type %d, length %d generated successfully.", KEY_TYPE, KEY_LENGTH_BITS);
return true;
@ -90,7 +93,8 @@ bool NetworkKey::Generate()
bool NetworkKey::LoadPrivate(SDL_RWops * file)
{
size_t size = (size_t)file->size(file);
if (size == (size_t)-1) {
if (size == (size_t)-1)
{
log_error("unknown size, refusing to load key");
return false;
}
@ -117,12 +121,12 @@ bool NetworkKey::LoadPrivate(SDL_RWops * file)
delete [] priv_key;
return false;
}
if (m_key != nullptr)
if (_key != nullptr)
{
EVP_PKEY_free(m_key);
EVP_PKEY_free(_key);
}
m_key = EVP_PKEY_new();
EVP_PKEY_set1_RSA(m_key, rsa);
_key = EVP_PKEY_new();
EVP_PKEY_set1_RSA(_key, rsa);
BIO_free_all(bio);
RSA_free(rsa);
delete [] priv_key;
@ -145,19 +149,20 @@ bool NetworkKey::LoadPublic(SDL_RWops * file)
char * pub_key = new char[size];
file->read(file, pub_key, 1, size);
BIO * bio = BIO_new_mem_buf(pub_key, size);
if (bio == nullptr) {
if (bio == nullptr)
{
log_error("Failed to initialise OpenSSL's BIO!");
delete [] pub_key;
return false;
}
RSA * rsa;
rsa = PEM_read_bio_RSAPublicKey(bio, nullptr, nullptr, nullptr);
if (m_key != nullptr)
if (_key != nullptr)
{
EVP_PKEY_free(m_key);
EVP_PKEY_free(_key);
}
m_key = EVP_PKEY_new();
EVP_PKEY_set1_RSA(m_key, rsa);
_key = EVP_PKEY_new();
EVP_PKEY_set1_RSA(_key, rsa);
BIO_free_all(bio);
RSA_free(rsa);
delete [] pub_key;
@ -166,19 +171,20 @@ bool NetworkKey::LoadPublic(SDL_RWops * file)
bool NetworkKey::SavePrivate(SDL_RWops *file)
{
if (m_key == nullptr)
if (_key == nullptr)
{
log_error("No key loaded");
return false;
}
#if KEY_TYPE == EVP_PKEY_RSA
RSA * rsa = EVP_PKEY_get1_RSA(m_key);
RSA * rsa = EVP_PKEY_get1_RSA(_key);
if (rsa == nullptr)
{
log_error("Failed to get RSA key handle!");
return false;
}
if (!RSA_check_key(rsa)) {
if (!RSA_check_key(rsa))
{
log_error("Loaded RSA key is invalid");
return false;
}
@ -188,7 +194,7 @@ bool NetworkKey::SavePrivate(SDL_RWops *file)
log_error("Failed to initialise OpenSSL's BIO!");
return false;
}
int result = PEM_write_bio_RSAPrivateKey(bio, rsa, NULL, NULL, 0, NULL, NULL);
int result = PEM_write_bio_RSAPrivateKey(bio, rsa, nullptr, nullptr, 0, nullptr, nullptr);
if (result != 1)
{
log_error("failed to write private key!");
@ -213,12 +219,12 @@ bool NetworkKey::SavePrivate(SDL_RWops *file)
bool NetworkKey::SavePublic(SDL_RWops *file)
{
if (m_key == nullptr)
if (_key == nullptr)
{
log_error("No key loaded");
return false;
}
RSA * rsa = EVP_PKEY_get1_RSA(m_key);
RSA * rsa = EVP_PKEY_get1_RSA(_key);
if (rsa == nullptr)
{
log_error("Failed to get RSA key handle!");
@ -251,13 +257,14 @@ bool NetworkKey::SavePublic(SDL_RWops *file)
std::string NetworkKey::PublicKeyString()
{
if (m_key == nullptr)
if (_key == nullptr)
{
log_error("No key loaded");
return nullptr;
}
RSA * rsa = EVP_PKEY_get1_RSA(m_key);
if (rsa == nullptr) {
RSA * rsa = EVP_PKEY_get1_RSA(_key);
if (rsa == nullptr)
{
log_error("Failed to get RSA key handle!");
return nullptr;
}
@ -301,7 +308,8 @@ std::string NetworkKey::PublicKeyString()
std::string NetworkKey::PublicKeyHash()
{
std::string key = PublicKeyString();
if (key.empty()) {
if (key.empty())
{
log_error("No key found");
return nullptr;
}
@ -346,7 +354,7 @@ bool NetworkKey::Sign(const uint8 * md, const size_t len, char ** signature, siz
return false;
}
/* Initialise the DigestSign operation - SHA-256 has been selected as the message digest function in this example */
if (1 != EVP_DigestSignInit(mdctx, NULL, EVP_sha256(), NULL, m_key))
if (1 != EVP_DigestSignInit(mdctx, nullptr, EVP_sha256(), nullptr, _key))
{
log_error("Failed to init digest sign");
EVP_MD_CTX_destroy(mdctx);
@ -361,9 +369,9 @@ bool NetworkKey::Sign(const uint8 * md, const size_t len, char ** signature, siz
}
/* Finalise the DigestSign operation */
/* First call EVP_DigestSignFinal with a NULL sig parameter to obtain the length of the
/* First call EVP_DigestSignFinal with a nullptr sig parameter to obtain the length of the
* signature. Length is returned in slen */
if (1 != EVP_DigestSignFinal(mdctx, NULL, out_size))
if (1 != EVP_DigestSignFinal(mdctx, nullptr, out_size))
{
log_error("failed to finalise signature");
EVP_MD_CTX_destroy(mdctx);
@ -395,7 +403,7 @@ bool NetworkKey::Sign(const uint8 * md, const size_t len, char ** signature, siz
bool NetworkKey::Verify(const uint8 * md, const size_t len, const char * sig, const size_t siglen)
{
EVP_MD_CTX * mdctx = NULL;
EVP_MD_CTX * mdctx = nullptr;
/* Create the Message Digest Context */
if (!(mdctx = EVP_MD_CTX_create()))
@ -404,7 +412,7 @@ bool NetworkKey::Verify(const uint8 * md, const size_t len, const char * sig, co
return false;
}
if (1 != EVP_DigestVerifyInit(mdctx, NULL, EVP_sha256(), NULL, m_key))
if (1 != EVP_DigestVerifyInit(mdctx, nullptr, EVP_sha256(), nullptr, _key))
{
log_error("Failed to initalise verification routine");
EVP_MD_CTX_destroy(mdctx);

6
src/network/NetworkKey.h
View File

@ -43,9 +43,9 @@ public:
bool Sign(const uint8 * md, const size_t len, char ** signature, size_t * out_size);
bool Verify(const uint8 * md, const size_t len, const char * sig, const size_t siglen);
private:
NetworkKey ( const NetworkKey & ) = delete;
EVP_PKEY_CTX * m_ctx = nullptr;
EVP_PKEY * m_key = nullptr;
NetworkKey (const NetworkKey &) = delete;
EVP_PKEY_CTX * _ctx = nullptr;
EVP_PKEY * _key = nullptr;
};
#endif // DISABLE_NETWORK

7
src/network/network.cpp
View File

@ -714,9 +714,10 @@ bool Network::BeginClient(const char* host, unsigned short port)
safe_strcat(keyPath, gConfigNetwork.player_name, MAX_PATH);
safe_strcat(keyPath, ".privkey", MAX_PATH);
if (!platform_file_exists(keyPath)) {
log_warning("generating key... this may take a while");
log_info("Generating key... This may take a while");
log_info("Need to collect enough entropy from the system");
key.Generate();
log_verbose("Key generated, saving private bits as %s", keyPath);
log_info("Key generated, saving private bits as %s", keyPath);
SDL_RWops *privkey = SDL_RWFromFile(keyPath, "wb+");
key.SavePrivate(privkey);
SDL_RWclose(privkey);
@ -727,7 +728,7 @@ bool Network::BeginClient(const char* host, unsigned short port)
safe_strcat(keyPath, "-", MAX_PATH);
safe_strcat(keyPath, key.PublicKeyHash().c_str(), MAX_PATH);
safe_strcat(keyPath, ".pubkey", MAX_PATH);
log_verbose("Key generated, saving public bits as %s", keyPath);
log_info("Key generated, saving public bits as %s", keyPath);
SDL_RWops *pubkey = SDL_RWFromFile(keyPath, "wb+");
key.SavePublic(pubkey);
SDL_RWclose(pubkey);