diff --git a/src/openrct2/core/Crypt.CNG.cpp b/src/openrct2/core/Crypt.CNG.cpp index 891a775506..dc1b096598 100644 --- a/src/openrct2/core/Crypt.CNG.cpp +++ b/src/openrct2/core/Crypt.CNG.cpp @@ -421,7 +421,7 @@ public: void SetPrivate(std::string_view pem) override { - auto der = ReadPEM(pem, SZ_PRIVATE_BEGIN_TOKEN, SZ_PRIVATE_END_TOKEN); + auto der = ReadPEM(pem, kPrivateKeyBeginToken, kPrivateKeyEndToken); DerReader derReader(der); RsaKeyParams params; derReader.ReadSequenceHeader(); @@ -439,7 +439,7 @@ public: void SetPublic(std::string_view pem) override { - auto der = ReadPEM(pem, SZ_PUBLIC_BEGIN_TOKEN, SZ_PUBLIC_END_TOKEN); + auto der = ReadPEM(pem, kPublicKeyBeginToken, kPublicKeyEndToken); DerReader derReader(der); RsaKeyParams params; derReader.ReadSequenceHeader(); @@ -465,9 +465,9 @@ public: auto b64 = EncodeBase64(derBytes); std::ostringstream sb; - sb << std::string(SZ_PRIVATE_BEGIN_TOKEN) << std::endl; + sb << std::string(kPrivateKeyBeginToken) << std::endl; sb << b64; - sb << std::string(SZ_PRIVATE_END_TOKEN) << std::endl; + sb << std::string(kPrivateKeyEndToken) << std::endl; return sb.str(); } @@ -481,9 +481,9 @@ public: auto b64 = EncodeBase64(derBytes); std::ostringstream sb; - sb << std::string(SZ_PUBLIC_BEGIN_TOKEN) << std::endl; + sb << std::string(kPublicKeyBeginToken) << std::endl; sb << b64; - sb << std::string(SZ_PUBLIC_END_TOKEN) << std::endl; + sb << std::string(kPublicKeyEndToken) << std::endl; return sb.str(); } @@ -506,10 +506,10 @@ public: } private: - static constexpr const char* SZ_PUBLIC_BEGIN_TOKEN = "-----BEGIN RSA PUBLIC KEY-----"; - static constexpr const char* SZ_PUBLIC_END_TOKEN = "-----END RSA PUBLIC KEY-----"; - static constexpr const char* SZ_PRIVATE_BEGIN_TOKEN = "-----BEGIN RSA PRIVATE KEY-----"; - static constexpr const char* SZ_PRIVATE_END_TOKEN = "-----END RSA PRIVATE KEY-----"; + static constexpr const char* kPublicKeyBeginToken = "-----BEGIN RSA PUBLIC KEY-----"; + static constexpr const char* kPublicKeyEndToken = "-----END RSA PUBLIC KEY-----"; + static constexpr const char* kPrivateKeyBeginToken = "-----BEGIN RSA PRIVATE KEY-----"; + static constexpr const char* kPrivateKeyEndToken = "-----END RSA PRIVATE KEY-----"; BCRYPT_KEY_HANDLE _hKey{}; BCRYPT_KEY_HANDLE _hAlg{};