From c458ee52b094b25f17943caf979ef9dd465af092 Mon Sep 17 00:00:00 2001 From: def Date: Wed, 19 Aug 2020 17:50:36 +0200 Subject: [PATCH] Remove need for custom certificate in anticipation of using CloudFlare --- CMakeLists.txt | 1 - data/ca-ddnet.pem | 135 ------------------------ data/languages/belarusian.txt | 2 +- data/languages/bosnian.txt | 2 +- data/languages/brazilian_portuguese.txt | 4 +- data/languages/bulgarian.txt | 2 +- data/languages/catalan.txt | 4 +- data/languages/chuvash.txt | 2 +- data/languages/czech.txt | 2 +- data/languages/danish.txt | 2 +- data/languages/dutch.txt | 4 +- data/languages/finnish.txt | 2 +- data/languages/french.txt | 4 +- data/languages/german.txt | 4 +- data/languages/greek.txt | 2 +- data/languages/hungarian.txt | 4 +- data/languages/italian.txt | 2 +- data/languages/japanese.txt | 2 +- data/languages/korean.txt | 2 +- data/languages/kyrgyz.txt | 2 +- data/languages/norwegian.txt | 2 +- data/languages/persian.txt | 4 +- data/languages/polish.txt | 4 +- data/languages/portuguese.txt | 2 +- data/languages/romanian.txt | 2 +- data/languages/russian.txt | 4 +- data/languages/serbian.txt | 2 +- data/languages/simplified_chinese.txt | 4 +- data/languages/slovak.txt | 2 +- data/languages/spanish.txt | 4 +- data/languages/swedish.txt | 4 +- data/languages/traditional_chinese.txt | 4 +- data/languages/turkish.txt | 2 +- data/languages/ukrainian.txt | 4 +- src/engine/client/client.cpp | 4 +- src/engine/client/http.cpp | 14 --- src/engine/client/updater.cpp | 2 +- src/engine/shared/config_variables.h | 2 +- src/game/client/components/menus.cpp | 2 +- src/game/variables.h | 2 +- 40 files changed, 52 insertions(+), 202 deletions(-) delete mode 100644 data/ca-ddnet.pem diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b6458d36..2ddb4e704 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -715,7 +715,6 @@ set(EXPECTED_DATA audio/wp_switch-03.wv blob.png browse_icons.png - ca-ddnet.pem console.png console_bar.png countryflags/AD.png diff --git a/data/ca-ddnet.pem b/data/ca-ddnet.pem deleted file mode 100644 index 8be57d603..000000000 --- a/data/ca-ddnet.pem +++ /dev/null @@ -1,135 +0,0 @@ -# deen Root CA for DDNet Updates ------BEGIN CERTIFICATE----- -MIIFnzCCA4egAwIBAgIJAJ4Aqsh5W5FRMA0GCSqGSIb3DQEBDQUAMGYxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhkZG5ldC50dzER -MA8GA1UEAwwIZGRuZXQudHcxHDAaBgkqhkiG9w0BCQEWDWRlZW5AZGRuZXQudHcw -HhcNMTUwMTE5MjA1MzQ2WhcNMjUwMTE2MjA1MzQ2WjBmMQswCQYDVQQGEwJBVTET -MBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwIZGRuZXQudHcxETAPBgNVBAMM -CGRkbmV0LnR3MRwwGgYJKoZIhvcNAQkBFg1kZWVuQGRkbmV0LnR3MIICIjANBgkq -hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3MHJtmD19kkBoHCfc/Kn7X6CvvLOMqcN -d7aE0L7G6sfjYZ0RiYuKKA+3SYtoRwhLft2gGR5l7SBW/OvDymtxgpQr/wY7vU+H -6ihixX8aQL3HG3Lp5eDeklVb0VpFwKGvsL6a9Xsu4mgIa4n3B4iODmVRk8vWAuJd -5brquqOZW33OMETfUzCtTDjl6ea5McUaXbCISrJmpyr60lGdvndmb9wG1hTaPQOF -iGRLZxk5PdAPoUkRvxRRszpaXleCX8ALUQfVO1ZlUaU6aZ9b8zrhtDqv3QVqu41D -+igKfvuZ/msxO8814SwoCd4qaR0/i+tyPU2Ber3Kg2TbdRMTvrR3qxOHzKYWnluX -eZtFculEYO+UvqmXci/w0lsWEpDrfMauBmoxOrXruaRH99wTQTERbA5uB8ao2Hwp -WENMi+aSjNzI9tmVGiqHP2kAT5IHsVLTkloz2Tk62uLt2SAIAl5h+ZqBFeO3S8P8 -EPX7QgNKnD5BqrP6pwI8vvC+jatFqNOuaGmmIezDuC0GrN8NPJJdupCxrD7HxE3P -C9fjVNliHh0N9TJd2TmivK7btYgpta9Y4bXK0zRN1s5dbiYxouhQVEp5rm+bXrBB -uaL4Hst+hm5HGL3ihe7jzCyRhbXGKEz+IzyT7hMr6xT41hd4r/1fFq//KiaQYD8P -IGu6NuuhDJ8CAwEAAaNQME4wHQYDVR0OBBYEFB67RNq8NgZRfEHlTh6JtSQLZxZn -MB8GA1UdIwQYMBaAFB67RNq8NgZRfEHlTh6JtSQLZxZnMAwGA1UdEwQFMAMBAf8w -DQYJKoZIhvcNAQENBQADggIBACt/YVLW737cV/kepZO3N0+bdEl9/DVGbrXFo98a -npab0F2XK/uv/eJgJCw9Ql6bMzDb+UO4Jy+yUMdCDVsIw4BUr7I06Mq3hC5bXSlw -2cIVwXtPgpfsu5ARHmHLN//5KPInBb7rx+pclTQhhq5//KrOkyX+NqIp65Lsvvfx -QwkRpZtaz1SoO1Pxr2CIyPF+ddvnYv8hxTzyO9bzss8jucP3ry2A7ruZs/agfmuc -5g3OVYvVfdWHjn5mdQDoLTV/yrBM2rchqrmvJBAhhY1lAcRu5ZQRZeKAT/RqWxKi -ygmcvf0EqKWlbbMYiTxxkHyVjNT9dH1Vd6I2uw0D4nBwoFBgUZxdjXmKq+c2pSJ9 -uj9EAJ6/A5pLCaTGhqocNNtwGNHl6x6yjNts8hGSUF126qYJyqOksX1MeRB3peZ5 -ERgxuMOp3ZvKGnSdXxgA/IXo5whclK2Fn8Mb3nqHK+znQYB9LZE0xroMvyp/Kr/x -SjNEuSw/XSM14kHzaTtKiGHOdRXZRwZfJtq7E2Hj6+GDOPKdCBcPcgWxNKVRL1Qr -ObSLh7yn0DrcslIOhh6feOEb6v/fdO6aOTCdoqGbtu1rgg8wopbNSMdGrNV7yZT+ -kx2eonbZSH3Djo7AYhYDz/b4XhpHJ5AlKMYyc61f+qRi/HLUBP16paP0MbGGB5Bb -Og9f ------END CERTIFICATE----- - -# Let's Encrypt Root ------BEGIN CERTIFICATE----- -MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4 -WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu -ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY -MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc -h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+ -0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U -A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW -T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH -B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC -B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv -KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn -OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn -jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw -qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI -rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV -HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq -hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL -ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ -3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK -NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5 -ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur -TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC -jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc -oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq -4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA -mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d -emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= ------END CERTIFICATE----- - -# Let's Encrypt Authority X3 ------BEGIN CERTIFICATE----- -MIIFjTCCA3WgAwIBAgIRANOxciY0IzLc9AUoUSrsnGowDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTYxMDA2MTU0MzU1 -WhcNMjExMDA2MTU0MzU1WjBKMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDEjMCEGA1UEAxMaTGV0J3MgRW5jcnlwdCBBdXRob3JpdHkgWDMwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc0wzwWuUuR7dyXTeDs2hjMOrX -NSYZJeG9vjXxcJIvt7hLQQWrqZ41CFjssSrEaIcLo+N15Obzp2JxunmBYB/XkZqf -89B4Z3HIaQ6Vkc/+5pnpYDxIzH7KTXcSJJ1HG1rrueweNwAcnKx7pwXqzkrrvUHl -Npi5y/1tPJZo3yMqQpAMhnRnyH+lmrhSYRQTP2XpgofL2/oOVvaGifOFP5eGr7Dc -Gu9rDZUWfcQroGWymQQ2dYBrrErzG5BJeC+ilk8qICUpBMZ0wNAxzY8xOJUWuqgz -uEPxsR/DMH+ieTETPS02+OP88jNquTkxxa/EjQ0dZBYzqvqEKbbUC8DYfcOTAgMB -AAGjggFnMIIBYzAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADBU -BgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEBATAwMC4GCCsGAQUFBwIB -FiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQub3JnMB0GA1UdDgQWBBSo -SmpjBH3duubRObemRWXv86jsoTAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3Js -LnJvb3QteDEubGV0c2VuY3J5cHQub3JnMHIGCCsGAQUFBwEBBGYwZDAwBggrBgEF -BQcwAYYkaHR0cDovL29jc3Aucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcvMDAGCCsG -AQUFBzAChiRodHRwOi8vY2VydC5yb290LXgxLmxldHNlbmNyeXB0Lm9yZy8wHwYD -VR0jBBgwFoAUebRZ5nu25eQBc4AIiMgaWPbpm24wDQYJKoZIhvcNAQELBQADggIB -ABnPdSA0LTqmRf/Q1eaM2jLonG4bQdEnqOJQ8nCqxOeTRrToEKtwT++36gTSlBGx -A/5dut82jJQ2jxN8RI8L9QFXrWi4xXnA2EqA10yjHiR6H9cj6MFiOnb5In1eWsRM -UM2v3e9tNsCAgBukPHAg1lQh07rvFKm/Bz9BCjaxorALINUfZ9DD64j2igLIxle2 -DPxW8dI/F2loHMjXZjqG8RkqZUdoxtID5+90FgsGIfkMpqgRS05f4zPbCEHqCXl1 -eO5HyELTgcVlLXXQDgAWnRzut1hFJeczY1tjQQno6f6s+nMydLN26WuU4s3UYvOu -OsUxRlJu7TSRHqDC3lSE5XggVkzdaPkuKGQbGpny+01/47hfXXNB7HntWNZ6N2Vw -p7G6OfY+YQrZwIaQmhrIqJZuigsrbe3W+gdn5ykE9+Ky0VgVUsfxo52mwFYs1JKY -2PGDuWx8M6DlS6qQkvHaRUo0FMd8TsSlbF0/v965qGFKhSDeQoMpYnwcmQilRh/0 -ayLThlHLN81gSkJjVrPI0Y8xCVPB4twb1PFUd2fPM3sA1tJ83sZ5v8vgFv2yofKR -PB0t6JzUA81mSqM3kxl5e+IZwhYAyO0OTg3/fs8HqGTNKd9BqoUwSRBzp06JMg5b -rUCGwbCUDI0mxadJ3Bz4WxR6fyNpBK2yAinWEsikxqEt ------END CERTIFICATE----- - -# Let's Encrypt Authority X4 ------BEGIN CERTIFICATE----- -MIIFjTCCA3WgAwIBAgIRAJObmZ6kjhYNW0JZtD0gE9owDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTYxMDA2MTU0NDM0 -WhcNMjExMDA2MTU0NDM0WjBKMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDEjMCEGA1UEAxMaTGV0J3MgRW5jcnlwdCBBdXRob3JpdHkgWDQwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhJHRCe7eRMdlz/ziq2M5EXLc5 -CtxErg29RbmXN2evvVBPX9MQVGv3QdqOY+ZtW8DoQKmMQfzRA4n/YmEJYNYHBXia -kL0aZD5P3M93L4lry2evQU3FjQDAa/6NhNy18pUxqOj2kKBDSpN0XLM+Q2lLiSJH -dFE+mWTDzSQB+YQvKHcXIqfdw2wITGYvN3TFb5OOsEY3FmHRUJjIsA9PWFN8rPba -LZZhUK1D3AqmT561Urmcju9O30azMdwg/GnCoyB1Puw4GzZOZmbS3/VmpJMve6YO -lD5gPUpLHG+6tE0cPJFYbi9NxNpw2+0BOXbASefpNbUUBpDB5ZLiEP1rubSFAgMB -AAGjggFnMIIBYzAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADBU -BgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEBATAwMC4GCCsGAQUFBwIB -FiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQub3JnMB0GA1UdDgQWBBTF -satOTLHNZDCTfsGEmQWr5gPiJTAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3Js -LnJvb3QteDEubGV0c2VuY3J5cHQub3JnMHIGCCsGAQUFBwEBBGYwZDAwBggrBgEF -BQcwAYYkaHR0cDovL29jc3Aucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcvMDAGCCsG -AQUFBzAChiRodHRwOi8vY2VydC5yb290LXgxLmxldHNlbmNyeXB0Lm9yZy8wHwYD -VR0jBBgwFoAUebRZ5nu25eQBc4AIiMgaWPbpm24wDQYJKoZIhvcNAQELBQADggIB -AF4tI1yGjZgld9lP01+zftU3aSV0un0d2GKUMO7GxvwTLWAKQz/eT+u3J4+GvpD+ -BMfopIxkJcDCzMChjjZtZZwJpIY7BatVrO6OkEmaRNITtbZ/hCwNkUnbk3C7EG3O -GJZlo9b2wzA8v9WBsPzHpTvLfOr+dS57LLPZBhp3ArHaLbdk33lIONRPt9sseDEk -mdHnVmGmBRf4+J0Wy67mddOvz5rHH8uzY94raOayf20gzzcmqmot4hPXtDG4Y49M -oFMMT2kcWck3EOTAH6QiGWkGJ7cxMfSL3S0niA6wgFJtfETETOZu8AVDgENgCJ3D -S0bz/dhVKvs3WRkaKuuR/W0nnC2VDdaFj4+CRF8LGtn/8ERaH48TktH5BDyDVcF9 -zfJ75Scxcy23jAL2N6w3n/t3nnqoXt9Im4FprDr+mP1g2Z6Lf2YA0jE3kZalgZ6l -NHu4CmvJYoOTSJw9X2qlGl1K+B4U327rG1tRxgjM76pN6lIS02PMECoyKJigpOSB -u4V8+LVaUMezCJH9Qf4EKeZTHddQ1t96zvNd2s9ewSKx/DblXbKsBDzIdHJ+qi6+ -F9DIVM5/ICdtDdulOO+dr/BXB+pBZ3uVxjRANvJKKpdxkePyluITSNZHbanWRN07 -gMvwBWOL060i4VrL9er1sBQrRjU9iNpZQGTnLVAxQVFu ------END CERTIFICATE----- diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt index bba0f7a6d..0650e9a10 100644 --- a/data/languages/belarusian.txt +++ b/data/languages/belarusian.txt @@ -729,7 +729,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt index 91da31d48..d2e3e8c6b 100644 --- a/data/languages/bosnian.txt +++ b/data/languages/bosnian.txt @@ -731,7 +731,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt index ecbdb2075..860733fa9 100644 --- a/data/languages/brazilian_portuguese.txt +++ b/data/languages/brazilian_portuguese.txt @@ -1029,8 +1029,8 @@ Date Show DDNet map finishes in server browser == Mostrar finalizações de mapas do DDNet no navegador do servidor -transmits your player name to info.ddnet.tw -== transmite seu nome de jogador para info.ddnet.tw +transmits your player name to info2.ddnet.tw +== transmite seu nome de jogador para info2.ddnet.tw Reload == Recarregar diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt index e388346d4..011cdfed2 100644 --- a/data/languages/bulgarian.txt +++ b/data/languages/bulgarian.txt @@ -726,7 +726,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt index 688679d27..183c59902 100644 --- a/data/languages/catalan.txt +++ b/data/languages/catalan.txt @@ -1010,8 +1010,8 @@ Date Show DDNet map finishes in server browser == Mostrar finalitzacions de mapes en el buscador de servidors -transmits your player name to info.ddnet.tw -== retransmet el teu nom de jugar a info.ddnet.tw +transmits your player name to info2.ddnet.tw +== retransmet el teu nom de jugar a info2.ddnet.tw Reload == Recarga diff --git a/data/languages/chuvash.txt b/data/languages/chuvash.txt index 1caa5c112..2cae0cad6 100644 --- a/data/languages/chuvash.txt +++ b/data/languages/chuvash.txt @@ -729,7 +729,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/czech.txt b/data/languages/czech.txt index b642dad91..aa1cb7076 100644 --- a/data/languages/czech.txt +++ b/data/languages/czech.txt @@ -732,7 +732,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/danish.txt b/data/languages/danish.txt index 03f4a27d6..c85b8206b 100644 --- a/data/languages/danish.txt +++ b/data/languages/danish.txt @@ -729,7 +729,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt index 99fe36972..e74f593a0 100644 --- a/data/languages/dutch.txt +++ b/data/languages/dutch.txt @@ -738,8 +738,8 @@ Video name: Show DDNet map finishes in server browser == Laat gefinishte maps zien in de verkenner -transmits your player name to info.ddnet.tw -== Verzend je speler naam naar info.ddnet.tw +transmits your player name to info2.ddnet.tw +== Verzend je speler naam naar info2.ddnet.tw Search == Zoek diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt index dc160f6f0..3697280be 100644 --- a/data/languages/finnish.txt +++ b/data/languages/finnish.txt @@ -730,7 +730,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/french.txt b/data/languages/french.txt index 577a248d8..6066ab610 100644 --- a/data/languages/french.txt +++ b/data/languages/french.txt @@ -1209,8 +1209,8 @@ Please enter your nick name below. Show DDNet map finishes in server browser == Afficher les cartes de DDNet terminées dans le navigateur -transmits your player name to info.ddnet.tw -== transmet votre pseudonyme à info.ddnet.tw +transmits your player name to info2.ddnet.tw +== transmet votre pseudonyme à info2.ddnet.tw Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/german.txt b/data/languages/german.txt index fdf92aabe..0a8df34e1 100644 --- a/data/languages/german.txt +++ b/data/languages/german.txt @@ -1137,8 +1137,8 @@ Default length: %d Pause == Pause -transmits your player name to info.ddnet.tw -== überträgt deinen Spielernamen an info.ddnet.tw +transmits your player name to info2.ddnet.tw +== überträgt deinen Spielernamen an info2.ddnet.tw The mouse wheel changes weapons. Hammer (left mouse) can be used to hit other tees and wake them up from being frozen. == Das Mausrad wechselt Waffen. Hammer (linke Maustaste) kann benutzt werden um andere Tees zu schlagen und vom Freeze aufzuwecken. diff --git a/data/languages/greek.txt b/data/languages/greek.txt index 3727ad1f1..fbb410ea6 100644 --- a/data/languages/greek.txt +++ b/data/languages/greek.txt @@ -732,7 +732,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/hungarian.txt b/data/languages/hungarian.txt index 36218636d..69c454144 100644 --- a/data/languages/hungarian.txt +++ b/data/languages/hungarian.txt @@ -1022,8 +1022,8 @@ Date Show DDNet map finishes in server browser == Mutassa a DDNet befejezett pályákat a keresőben -transmits your player name to info.ddnet.tw -== Keress rá a játékosnevedre az info.ddnet.tw oldalon +transmits your player name to info2.ddnet.tw +== Keress rá a játékosnevedre az info2.ddnet.tw oldalon Reload == újratöltés diff --git a/data/languages/italian.txt b/data/languages/italian.txt index 363950583..8972f30da 100644 --- a/data/languages/italian.txt +++ b/data/languages/italian.txt @@ -735,7 +735,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/japanese.txt b/data/languages/japanese.txt index 055cf2268..d6fc3ff80 100644 --- a/data/languages/japanese.txt +++ b/data/languages/japanese.txt @@ -729,7 +729,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/korean.txt b/data/languages/korean.txt index 3373e2e52..f81ebc82a 100644 --- a/data/languages/korean.txt +++ b/data/languages/korean.txt @@ -728,7 +728,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/kyrgyz.txt b/data/languages/kyrgyz.txt index 85bf691ed..249653bad 100644 --- a/data/languages/kyrgyz.txt +++ b/data/languages/kyrgyz.txt @@ -723,7 +723,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt index cad8ffc4b..b399bdee5 100644 --- a/data/languages/norwegian.txt +++ b/data/languages/norwegian.txt @@ -729,7 +729,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/persian.txt b/data/languages/persian.txt index e80187eb5..19c871eca 100644 --- a/data/languages/persian.txt +++ b/data/languages/persian.txt @@ -585,8 +585,8 @@ Are you sure that you want to disconnect your dummy? == ؟ﺪﯿﻨﻛ ﻊﻄﻗ ﺍﺭ ﺩﻮﺧ ﯽﻣﺍﺩ ﻁﺎﺒﺗﺭﺍ ﺪﯿﻫﺍﻮﺧ ﯽﻣ ﻪﻛ ﺪﯿﺘﺴﻫ ﻦﺌﻤﻄﻣ ﺎﯾﺁ Save ghost == ﺡﻭﺭ ﻩﺮﯿﺧﺫ -transmits your player name to info.ddnet.tw -== ﺪﯿﻨﻛ ﻞﻘﺘﻨﻣ info.ddnet.tw ﻪﺑ ﺍﺭ ﺩﻮﺧ ﻦﻜﯾﺯﺎﺑ ﻡﺎﻧ +transmits your player name to info2.ddnet.tw +== ﺪﯿﻨﻛ ﻞﻘﺘﻨﻣ info2.ddnet.tw ﻪﺑ ﺍﺭ ﺩﻮﺧ ﻦﻜﯾﺯﺎﺑ ﻡﺎﻧ Replay %3d:%02d == d٢٠%:d٣% ﺶﺨﭘﺯﺎﺑ Unfinished map diff --git a/data/languages/polish.txt b/data/languages/polish.txt index be32a9df9..f1294ef45 100644 --- a/data/languages/polish.txt +++ b/data/languages/polish.txt @@ -1187,8 +1187,8 @@ Please enter your nick name below. Show DDNet map finishes in server browser == Pokaż ukończone mapy DDNet w wyszukiwarce serwerów -transmits your player name to info.ddnet.tw -== przenosi twój nick do info.ddnet.tw +transmits your player name to info2.ddnet.tw +== przenosi twój nick do info2.ddnet.tw Indicate map finish == Pokazuj ukończone mapy diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt index 45a3c5e10..3f8db848f 100644 --- a/data/languages/portuguese.txt +++ b/data/languages/portuguese.txt @@ -967,7 +967,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Filter connecting players diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt index e1bbc1a69..57e2c4c01 100644 --- a/data/languages/romanian.txt +++ b/data/languages/romanian.txt @@ -738,7 +738,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/russian.txt b/data/languages/russian.txt index 884e70a97..6576b8ad3 100644 --- a/data/languages/russian.txt +++ b/data/languages/russian.txt @@ -912,8 +912,8 @@ Video name: Show DDNet map finishes in server browser == Показывать в браузере статус завершения карты -transmits your player name to info.ddnet.tw -== передает Ваш никнейм на info.ddnet.tw +transmits your player name to info2.ddnet.tw +== передает Ваш никнейм на info2.ddnet.tw Exclude == Исключить diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt index 228ffe9e5..08e8ed1e6 100644 --- a/data/languages/serbian.txt +++ b/data/languages/serbian.txt @@ -727,7 +727,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/simplified_chinese.txt b/data/languages/simplified_chinese.txt index 1c4a4bdf2..be0e008cc 100644 --- a/data/languages/simplified_chinese.txt +++ b/data/languages/simplified_chinese.txt @@ -1017,8 +1017,8 @@ Date Show DDNet map finishes in server browser == 在服务器浏览器中显示已完成的 DDNet 地图 -transmits your player name to info.ddnet.tw -== 将会发送您的玩家名称到 info.ddnet.tw +transmits your player name to info2.ddnet.tw +== 将会发送您的玩家名称到 info2.ddnet.tw Reload == 刷新 diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt index c5f2e7c9e..fc5b20c38 100644 --- a/data/languages/slovak.txt +++ b/data/languages/slovak.txt @@ -729,7 +729,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt index 80d20111e..c8c5ceacb 100644 --- a/data/languages/spanish.txt +++ b/data/languages/spanish.txt @@ -735,8 +735,8 @@ Video name: Show DDNet map finishes in server browser == Marcar los mapas DDNet acabados en el navegador de servidores -transmits your player name to info.ddnet.tw -== transmite tu nombre de jugador a info.ddnet.tw +transmits your player name to info2.ddnet.tw +== transmite tu nombre de jugador a info2.ddnet.tw Search == Buscar diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt index 8fdfa9a69..7c61a73ec 100644 --- a/data/languages/swedish.txt +++ b/data/languages/swedish.txt @@ -770,8 +770,8 @@ Personal best: Show DDNet map finishes in server browser == Visa DDNet bana avklarningar i server bläddraren -transmits your player name to info.ddnet.tw -== skickar ditt spel namn till info.ddnet.tw +transmits your player name to info2.ddnet.tw +== skickar ditt spel namn till info2.ddnet.tw 9+ new mentions == 9+ nya nämningar diff --git a/data/languages/traditional_chinese.txt b/data/languages/traditional_chinese.txt index c0979ed62..dcec6d3ef 100644 --- a/data/languages/traditional_chinese.txt +++ b/data/languages/traditional_chinese.txt @@ -1010,8 +1010,8 @@ Date Show DDNet map finishes in server browser == 在伺服器瀏覽器中顯示已完成的 DDNet 地圖 -transmits your player name to info.ddnet.tw -== 將會發送您的玩家名稱到 info.ddnet.tw +transmits your player name to info2.ddnet.tw +== 將會發送您的玩家名稱到 info2.ddnet.tw Reload == 刷新 diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt index 790c30d21..67ca4f999 100644 --- a/data/languages/turkish.txt +++ b/data/languages/turkish.txt @@ -731,7 +731,7 @@ Video name: Show DDNet map finishes in server browser == -transmits your player name to info.ddnet.tw +transmits your player name to info2.ddnet.tw == Search diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt index 5a2aaa6c8..99bea16b1 100644 --- a/data/languages/ukrainian.txt +++ b/data/languages/ukrainian.txt @@ -603,8 +603,8 @@ Video name: Show DDNet map finishes in server browser == Показувати статус завершення карти DDNet в браузері сервера -transmits your player name to info.ddnet.tw -== передає Ваш нікнейм на info.ddnet.tw +transmits your player name to info2.ddnet.tw +== передає Ваш нікнейм на info2.ddnet.tw Search == Поиск diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index a20fa9ab7..373a44427 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -4231,9 +4231,9 @@ void CClient::RequestDDNetInfo() char aUrl[256]; static bool s_IsWinXP = os_is_winxp_or_lower(); if(s_IsWinXP) - str_copy(aUrl, "http://info.ddnet.tw/info", sizeof(aUrl)); + str_copy(aUrl, "http://info2.ddnet.tw/info", sizeof(aUrl)); else - str_copy(aUrl, "https://info.ddnet.tw/info", sizeof(aUrl)); + str_copy(aUrl, "https://info2.ddnet.tw/info", sizeof(aUrl)); if(g_Config.m_BrIndicateFinished) { diff --git a/src/engine/client/http.cpp b/src/engine/client/http.cpp index a3dbe4a3a..f0d8eca16 100644 --- a/src/engine/client/http.cpp +++ b/src/engine/client/http.cpp @@ -11,7 +11,6 @@ #include "curl/curl.h" #include "curl/easy.h" -static char CA_FILE_PATH[512]; // TODO: Non-global pls? static CURLSH *gs_Share; static LOCK gs_aLocks[CURL_LOCK_DATA_LAST+1]; @@ -48,7 +47,6 @@ bool HttpInit(IStorage *pStorage) dbg_msg("http", "libcurl version %s (compiled = " LIBCURL_VERSION ")", pVersion->version); } - pStorage->GetBinaryPath("data/ca-ddnet.pem", CA_FILE_PATH, sizeof(CA_FILE_PATH)); if(curl_global_init(CURL_GLOBAL_DEFAULT)) { return true; @@ -138,18 +136,6 @@ int CRequest::RunImpl(CURL *pHandle) curl_easy_setopt(pHandle, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(pHandle, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")"); - // We only trust our own custom-selected CAs for our own servers. - // Other servers can use any CA trusted by the system. - if(false - || str_comp_nocase_num("maps.ddnet.tw/", m_aUrl, 14) == 0 - || str_comp_nocase_num("http://maps.ddnet.tw/", m_aUrl, 21) == 0 - || str_comp_nocase_num("https://maps.ddnet.tw/", m_aUrl, 22) == 0 - || str_comp_nocase_num("http://info.ddnet.tw/", m_aUrl, 21) == 0 - || str_comp_nocase_num("https://info.ddnet.tw/", m_aUrl, 22) == 0 - || str_comp_nocase_num("https://update5.ddnet.tw/", m_aUrl, 25) == 0) - { - curl_easy_setopt(pHandle, CURLOPT_CAINFO, CA_FILE_PATH); - } curl_easy_setopt(pHandle, CURLOPT_WRITEDATA, this); curl_easy_setopt(pHandle, CURLOPT_WRITEFUNCTION, WriteCallback); curl_easy_setopt(pHandle, CURLOPT_NOPROGRESS, 0L); diff --git a/src/engine/client/updater.cpp b/src/engine/client/updater.cpp index 497c71dfd..6e56d780c 100644 --- a/src/engine/client/updater.cpp +++ b/src/engine/client/updater.cpp @@ -27,7 +27,7 @@ public: static const char *GetUpdaterUrl(char *pBuf, int BufSize, const char *pFile) { - str_format(pBuf, BufSize, "https://update5.ddnet.tw/%s", pFile); + str_format(pBuf, BufSize, "https://update6.ddnet.tw/%s", pFile); return pBuf; } diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 9720ef5c6..f495b5008 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -56,7 +56,7 @@ MACRO_CONFIG_INT(BrFilterUnfinishedMap, br_filter_unfinished_map, 0, 0, 1, CFGFL MACRO_CONFIG_STR(BrFilterExcludeCountries, br_filter_exclude_countries, 128, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out DDNet servers by country") MACRO_CONFIG_STR(BrFilterExcludeTypes, br_filter_exclude_types, 128, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out DDNet servers by type (mod)") -MACRO_CONFIG_INT(BrIndicateFinished, br_indicate_finished, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Show whether you have finished a DDNet map (transmits your player name to info.ddnet.tw/info)") +MACRO_CONFIG_INT(BrIndicateFinished, br_indicate_finished, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Show whether you have finished a DDNet map (transmits your player name to info2.ddnet.tw/info)") MACRO_CONFIG_STR(BrFilterExcludeCountriesKoG, br_filter_exclude_countries_kog, 128, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out kog servers by country") MACRO_CONFIG_STR(BrFilterExcludeTypesKoG, br_filter_exclude_types_kog, 128, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out kog servers by type (mod)") diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 5e14dd9cf..b7acf1c57 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -1789,7 +1789,7 @@ int CMenus::Render() char aBuf[128]; str_format(aBuf, sizeof(aBuf), "%s\n(%s)", Localize("Show DDNet map finishes in server browser"), - Localize("transmits your player name to info.ddnet.tw")); + Localize("transmits your player name to info2.ddnet.tw")); if(DoButton_CheckBox(&g_Config.m_BrIndicateFinished, aBuf, g_Config.m_BrIndicateFinished, &Part)) g_Config.m_BrIndicateFinished ^= 1; diff --git a/src/game/variables.h b/src/game/variables.h index 9f9510453..6cef35fb0 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -76,7 +76,7 @@ MACRO_CONFIG_INT(EdShowkeys, ed_showkeys, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, MACRO_CONFIG_INT(ClShowWelcome, cl_show_welcome, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "") MACRO_CONFIG_INT(ClMotdTime, cl_motd_time, 10, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SAVE, "How long to show the server message of the day") -MACRO_CONFIG_STR(ClDDNetMapDownloadUrl, cl_ddnet_map_download_url, 100, "https://maps.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "URL to use to download maps (can start with http:// or https://)") +MACRO_CONFIG_STR(ClDDNetMapDownloadUrl, cl_ddnet_map_download_url, 100, "https://maps2.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "URL to use to download maps (can start with http:// or https://)") MACRO_CONFIG_STR(ClLanguagefile, cl_languagefile, 255, "", CFGFLAG_CLIENT|CFGFLAG_SAVE, "What language file to use") MACRO_CONFIG_INT(ClVanillaSkinsOnly, cl_vanilla_skins_only, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Only show skins available in Vanilla Teeworlds")