summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2015-12-22 17:39:09 +0100
committerAlexander Harkness <me@bearbin.net>2015-12-22 17:39:09 +0100
commit2b27bf9f2259522007b1edfdd6576be1555cee19 (patch)
tree9b1e21d1f225e64ac7c9b87dfa29daef6d1a66be /src
parentMerge pull request #2788 from SafwatHalaby/jump (diff)
parentAdded GeoTrust Root Certificate (diff)
downloadcuberite-2b27bf9f2259522007b1edfdd6576be1555cee19.tar
cuberite-2b27bf9f2259522007b1edfdd6576be1555cee19.tar.gz
cuberite-2b27bf9f2259522007b1edfdd6576be1555cee19.tar.bz2
cuberite-2b27bf9f2259522007b1edfdd6576be1555cee19.tar.lz
cuberite-2b27bf9f2259522007b1edfdd6576be1555cee19.tar.xz
cuberite-2b27bf9f2259522007b1edfdd6576be1555cee19.tar.zst
cuberite-2b27bf9f2259522007b1edfdd6576be1555cee19.zip
Diffstat (limited to 'src')
-rwxr-xr-xsrc/CheckBasicStyle.lua2
-rw-r--r--src/Protocol/MojangAPI.cpp25
2 files changed, 25 insertions, 2 deletions
diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua
index 3f0d2bd45..81968688c 100755
--- a/src/CheckBasicStyle.lua
+++ b/src/CheckBasicStyle.lua
@@ -194,7 +194,7 @@ local g_ViolationPatterns =
-- Check spaces around "==", "<=" and ">=":
{"==[a-zA-Z0-9]+", "Add space after =="},
- {"[a-zA-Z0-9]+==", "Add space before =="},
+ {"[a-zA-Z0-9]+==[^\\]", "Add space before =="},
{"<=[a-zA-Z0-9]+", "Add space after <="},
{"[a-zA-Z0-9]+<=", "Add space before <="},
{">=[a-zA-Z0-9]+", "Add space after >="},
diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp
index 4747ace72..dfbf9a568 100644
--- a/src/Protocol/MojangAPI.cpp
+++ b/src/Protocol/MojangAPI.cpp
@@ -42,10 +42,33 @@ const int MAX_PER_QUERY = 100;
static const AString & GetCACerts(void)
{
static const AString Cert(
- // Equifax root CA cert
+ // GeoTrust root CA cert
// Currently used for signing *.mojang.com's cert
// Exported from Mozilla Firefox's built-in CA repository
"-----BEGIN CERTIFICATE-----\n"
+ "MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT\n"
+ "MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i\n"
+ "YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG\n"
+ "EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg\n"
+ "R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9\n"
+ "9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq\n"
+ "fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv\n"
+ "iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU\n"
+ "1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+\n"
+ "bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW\n"
+ "MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA\n"
+ "ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l\n"
+ "uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn\n"
+ "Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS\n"
+ "tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF\n"
+ "PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un\n"
+ "hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV\n"
+ "5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==\n"
+ "-----END CERTIFICATE-----\n\n"
+
+ // Equifax root CA cert
+ // Exported from Mozilla Firefox's built-in CA repository
+ "-----BEGIN CERTIFICATE-----\n"
"MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV\n"
"UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy\n"
"dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1\n"