edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove need for custom certificate

Browse source 
in anticipation of using CloudFlare
This commit is contained in:
def 2020-08-19 17:50:36 +02:00
parent b147950ef1
commit c458ee52b0
40 changed files with 52 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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

135
data/ca-ddnet.pem
View file

@ -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-----

2
data/languages/belarusian.txt
View file

@ -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

2
data/languages/bosnian.txt
View file

@ -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

4
data/languages/brazilian_portuguese.txt
View file

@ -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

2
data/languages/bulgarian.txt
View file

@ -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

4
data/languages/catalan.txt
View file

@ -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

2
data/languages/chuvash.txt
View file

@ -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

2
data/languages/czech.txt
View file

@ -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

2
data/languages/danish.txt
View file

@ -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

4
data/languages/dutch.txt
View file

@ -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

2
data/languages/finnish.txt
View file

@ -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

4
data/languages/french.txt
View file

@ -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.
==

4
data/languages/german.txt
View file

@ -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.

2
data/languages/greek.txt
View file

@ -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

4
data/languages/hungarian.txt
View file

@ -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

2
data/languages/italian.txt
View file

@ -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

2
data/languages/japanese.txt
View file

@ -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

2
data/languages/korean.txt
View file

@ -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

2
data/languages/kyrgyz.txt
View file

@ -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

2
data/languages/norwegian.txt
View file

@ -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

4
data/languages/persian.txt
View file

@ -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

4
data/languages/polish.txt
View file

@ -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

2
data/languages/portuguese.txt
View file

@ -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

2
data/languages/romanian.txt
View file

@ -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

4
data/languages/russian.txt
View file

@ -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
== Исключить

2
data/languages/serbian.txt
View file

@ -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

4
data/languages/simplified_chinese.txt
View file

@ -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
== 刷新

2
data/languages/slovak.txt
View file

@ -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

4
data/languages/spanish.txt
View file

@ -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

4
data/languages/swedish.txt
View file

@ -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

4
data/languages/traditional_chinese.txt
View file

@ -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
== 刷新

2
data/languages/turkish.txt
View file

@ -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

4
data/languages/ukrainian.txt
View file

@ -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
== Поиск

4
src/engine/client/client.cpp
View file

@ -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)
{

14
src/engine/client/http.cpp
View file

@ -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);

2
src/engine/client/updater.cpp
View file

@ -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;
}

2
src/engine/shared/config_variables.h
View file

@ -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)")

2
src/game/client/components/menus.cpp
View file

@ -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;

2
src/game/variables.h
View file

@ -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")