diff --git a/certs/install.ps1 b/certs/install.ps1 deleted file mode 100644 index c4c4c37..0000000 --- a/certs/install.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -$certPath = "C:\Path\to\Certificates" # Specify the path where your .crt certificates are located - -$certFiles = Get-ChildItem -Path $certPath -Filter *.crt - -$certStore = Get-Item -Path "Cert:\LocalMachine\Root" - -foreach ($certFile in $certFiles) { - $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2 - $cert.Import($certFile.FullName) - - if (!$certStore.Contains($cert)) { - $certStore.Add($cert) - Write-Host "Certificate $($cert.Subject) imported successfully." - } else { - Write-Host "Certificate $($cert.Subject) already exists in the store." - } -} - diff --git a/certs/more.sh b/certs/more.sh index 43e7668..3674628 100644 --- a/certs/more.sh +++ b/certs/more.sh @@ -1,25 +1,14 @@ #!/bin/bash echo "Don't run this unless you want new certs. Just use the ones already generated!" -exit +#exit echo "This script removes all cert files in the directory." echo "Continue? Press enter!" read rm *.srl *.key *.csr *.crt *.pem *.ext *.pfx > /dev/null # Generate Root Certificate and Key -openssl req -newkey rsa:2048 -nodes -keyout root.key -x509 -days 3650 -out root.crt -subj "/C=JP/ST=A/L=A/CN=Taito Arcade Machine CA" \ - -addext "subjectAltName = DNS:cert.nesys.jp,DNS:cert3.nesys.jp,DNS:data.nesys.jp,DNS:proxy.nesys.jp,DNS:nesys.taito.co.jp,DNS:fjm170920zero.nesica.net" - -# pfx export -openssl pkcs12 -passout pass:harasho -export -in root.crt -inkey root.key -out root.pfx - +openssl req -newkey rsa:2048 -nodes -keyout root.key -x509 -days 3650 -out root.crt -subj "/C=JP/ST=A/L=A/CN=Taito Arcade Machine CA" # Generate Second Certificate and Key -openssl req -newkey rsa:2048 -nodes -keyout nesys.key -out nesys.crt -CA root.crt -CAkey root.key -subj "/C=JP/ST=A/L=A/CN=nesys" -addext "subjectAltName = DNS:cert.nesys.jp,DNS:cert3.nesys.jp,DNS:data.nesys.jp,DNS:proxy.nesys.jp,DNS:nesys.taito.co.jp,DNS:fjm170920zero.nesica.net" -days 3650 - -# pfx export -openssl pkcs12 -passout pass:harasho -export -in nesys.crt -inkey nesys.key -out nesys.pfx +openssl req -newkey rsa:2048 -nodes -keyout nesys.key -out nesys.crt -CA root.crt -CAkey root.key -subj "/C=JP/ST=A/L=A/CN=nesys" -days 3650 # Generate Last Certificate and Key openssl req -newkey rsa:2048 -nodes -keyout nesica1.key -out nesica1.crt -CA nesys.crt -CAkey nesys.key -subj "/C=JP/ST=A/L=A/CN=nesica1" -addext "subjectAltName = DNS:cert.nesys.jp,DNS:cert3.nesys.jp,DNS:data.nesys.jp,DNS:proxy.nesys.jp,DNS:nesys.taito.co.jp,DNS:fjm170920zero.nesica.net" -days 3650 - -# pfx export -openssl pkcs12 -passout pass:harasho -export -in nesica1.crt -inkey nesica1.key -out nesica1.pfx diff --git a/certs/nesica1.crt b/certs/nesica1.crt index 148e9b6..6ddf3d2 100644 --- a/certs/nesica1.crt +++ b/certs/nesica1.crt @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDxTCCAq2gAwIBAgIUJOMGzOmQ0JoplXO6hA9m/sPvnRAwDQYJKoZIhvcNAQEL +MIIDxTCCAq2gAwIBAgIUfH7CYtnS909tjCJmn3h+9oqsLzUwDQYJKoZIhvcNAQEL BQAwNTELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExDjAMBgNV -BAMMBW5lc3lzMB4XDTIzMDUyNzAxMzgzMFoXDTMzMDUyNDAxMzgzMFowNzELMAkG +BAMMBW5lc3lzMB4XDTIzMDYwNTAwMDc1OVoXDTMzMDYwMjAwMDc1OVowNzELMAkG A1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExEDAOBgNVBAMMB25lc2lj -YTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5+XnZzMuYHxFX+wkc -zaHjWGJqhmV9eyZpIo297AjP5ubfWKvg3FKk0/my/q2SUm1Kt8aQnS37H/5rcr1W -L3WsofrFiv4ZgwH7ZUcsHbqmJfNZhNyglFWYmGU0MXzsJmeXjNhozky7FG+z8Adc -rvnF/JpJ9TBahse2qhxQDgX33SDRjjk9/y4fOh6lghMSpTbd6z8fSp4/Vk3JtbAr -8Ky/CyIbnHtOzux9S65To8iPc1DjpkkQnNju5/QnWzLx0hH0EyXddGl65xKEJNW2 -g31KLZBgw+TpopC9HgDjuZym5W1K9Mb8/fL00GKKsKpjQ1/+mwzvJkHbueXwUsuR -kN27AgMBAAGjgcowgccwHQYDVR0OBBYEFNnVXYq7uJCCPKX7fMpuKdn8INlTMB8G -A1UdIwQYMBaAFI5z25CW4S44KESanTvj2FJ6h9InMA8GA1UdEwEB/wQFMAMBAf8w +YTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCX+/yIAFz9TpeyQxw +b3YYL+9Ngfedmxil7U3HZcpDR+2ysNtmdMTIVzQhz+ql7y3BJ+CSriEvDotuhRp1 +5RFANcqf5JoolZ9m3a6BZZkQrjBZqCD7UOTExf11WKLq05N0Nr0EKoGRn4PQF04m +W/3zjpx3M53EbOAVq5bstGyClrTWItvHpzuJ3doCLotTUOKW+b6B5WPnjkPBuR9B +kMa9Ru1ZlQqxkEVxAqLdNSOLVisTASZ91ZmLhQM7klOSfMbO/6tWV2ZKgQ02Cdjt +7tEYKakGfmT21YT3q2f/2FF9TyarX9nma4RLnoNwt+GlH8bZFukr/Nkk2sf1jRZk +YecdAgMBAAGjgcowgccwHQYDVR0OBBYEFCMsf1N9KUmlPlwvFw4CBIXAuxo1MB8G +A1UdIwQYMBaAFNIBY5H/aDapjbeUecKlfXXV6ouRMA8GA1UdEwEB/wQFMAMBAf8w dAYDVR0RBG0wa4INY2VydC5uZXN5cy5qcIIOY2VydDMubmVzeXMuanCCDWRhdGEu bmVzeXMuanCCDnByb3h5Lm5lc3lzLmpwghFuZXN5cy50YWl0by5jby5qcIIYZmpt -MTcwOTIwemVyby5uZXNpY2EubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQCd7rpbY5L9 -GMRYyihzo69gC4X7OyBwlIdJzMkgrGHKjl0JqZFCihb6CLvCdq7IhTH1FoGtbSCX -gCSNGFcTHuQQlZXb9ZAswnBbAh0baqOJohi0Qr0KsiH0iEkc7zsP2kCq3/pHAb1l -BGAaJizLUpQYwmfYcPEUbjN+fCjEyqIlE+c2gmtd0kAFCfNOkEzXy3uAvgMLLVoQ -wK0kLFraPcRH+KzBHrHREbxg8gGE6tfCLM5YtmkK3yixyk2RA+7YR91gr2wk2IUS -s+6QJxgP4ABZpEborLF0AE60voIjBrr/lzz8h0V9HEfHZZkWEDKG0ZH+Bf0TN+tt -BLA8hOXqsxAs +MTcwOTIwemVyby5uZXNpY2EubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQAXSf9Tk/i2 +/Sq2mE5TiFSbhnLQB8GAn1UbiVZb6MSlrNDDuvVCk7MkYT2OnLamlbE1sdblU7/J +TIESBo4hjlwBaN61KpGRnf4NVrBh7gyCmcOHmlSAxL0+Irc0ZzwFk6Dz47MSGwYJ +QCeGWvryQdTxKpqzf04u5kOzWezoyTzxnxqw4VyxNZRXaYGfdLnzzm31jLl0Wd8d +oVyCwDmDN2lb71S5XJ47ugR+bRD3YDm0ZS+42qLvvA8FaIV/lOV1xK6So29yEz0P +HvLi/sJs0Mck7ZlG56MzwSCYHNcFTBGVVIZM2tcxWsXS/+VxtHJtbysY64eHnYog +G/7ah4CXcWtI -----END CERTIFICATE----- diff --git a/certs/nesica1.key b/certs/nesica1.key index 1ee6848..051bb59 100644 --- a/certs/nesica1.key +++ b/certs/nesica1.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5+XnZzMuYHxFX -+wkczaHjWGJqhmV9eyZpIo297AjP5ubfWKvg3FKk0/my/q2SUm1Kt8aQnS37H/5r -cr1WL3WsofrFiv4ZgwH7ZUcsHbqmJfNZhNyglFWYmGU0MXzsJmeXjNhozky7FG+z -8AdcrvnF/JpJ9TBahse2qhxQDgX33SDRjjk9/y4fOh6lghMSpTbd6z8fSp4/Vk3J -tbAr8Ky/CyIbnHtOzux9S65To8iPc1DjpkkQnNju5/QnWzLx0hH0EyXddGl65xKE -JNW2g31KLZBgw+TpopC9HgDjuZym5W1K9Mb8/fL00GKKsKpjQ1/+mwzvJkHbueXw -UsuRkN27AgMBAAECggEADIu/Wul/opeDqkxW0r/BHKNyVxDI1Ifz/tTWfDMy/iE0 -/o1cPUeyACSYHpcjJnWOxn53U+kGmH9/d38Hx/k4OwbdzbJaJWZxr8kUuTbhWkd4 -jzMn6D1QXYJlzNS51LI3IIq6uhvZ2UvkyKdThYf84sOBa+9DpGDmtwbGOjBTbHWp -cEegE+6aCro+KZCvW2It57245hOKaqbrS4EdSuir1+SJ44HxIHuLTE7JSM5+IHEP -64naYN/gExoo2Ww/L3bPap8l+4vIjnePgWJLtZVaRWhecaGvUcijrB1gOi664TqD -tkDwS2ZERA+Dh32Bv5L9AmchH8+G6MH/MNtmGogUoQKBgQDGHE/k6DRBnbtoheZD -sqskSmE50d9u2DQwXm2jYb6PDy59BpmzTu/P5uarlv1eYoXPOTwmJ+yG+E195QAa -LRmI1xBN27RKqD69XNIh2JMqWPWa5UI26y42Vs02hyTrJBiGjxljelrMMLIqFvKv -zQvtVplcd0RrRLOZK/gMZ5+g7wKBgQDwUVKw1072Sf2Es5PhvBIFCBAOJgTQ8VRl -FEUgC6l4Nysw+XVkwuKQxGXxuGUHZ3DYDl6LPf2oULzG2iHR2FNaFDGP0ZrTFkg7 -F4kAozZyBGwMMnlzsOYwoeEIhqmkgoVpDhvLni73crwjmSuow6trdjwM6SMP6h8m -2T+TYE+39QKBgCaLdaP05c3qcX8Zpj5/sbqi2h3UzqMTX7wVc0F5kAjnjET5FsiD -UDdkFndGLk/B3YT+/svxspxkDTe0aXuuUKyGI37ygzaPW32eZKf/Kkrv+gFEH8jt -oxUheFXmn3E8maT8jJUFRks6Ij/8LQW1YF+yHK6X6fDw8fyYSG+pba5zAoGAKCf+ -oEwqBp+QfEchk9vASxTw0dxqe5uH1agQcO1h8ROO5Q0aH68s+rHGsyBzyUvwoDmu -dKf0Jdbv5G54rj7ulqO/MF/+9fzILw+ctf2P0HeKsnMQtlM986xpFOqjmDizID3a -SSjygiiq5Wvnzrh7gWZtXF7sm/EsKWqt4+t5Bq0CgYEAvVt9UELmw2LlkLL0Po/j -zlpvfBj4CyyHRE1UZVyVqw+kZo+0DFmG0DFtt5QRkhgJF4G6cePzMWRKObowW28J -Ve78z7sKP2ZB+M91CeqYqt/x9unaHrkO7OVcUnxnMJciNiDCYO3IR6gRJqEHyKfn -KIQ0nspTwXDFQU1Baya7T6I= +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCX+/yIAFz9Tpe +yQxwb3YYL+9Ngfedmxil7U3HZcpDR+2ysNtmdMTIVzQhz+ql7y3BJ+CSriEvDotu +hRp15RFANcqf5JoolZ9m3a6BZZkQrjBZqCD7UOTExf11WKLq05N0Nr0EKoGRn4PQ +F04mW/3zjpx3M53EbOAVq5bstGyClrTWItvHpzuJ3doCLotTUOKW+b6B5WPnjkPB +uR9BkMa9Ru1ZlQqxkEVxAqLdNSOLVisTASZ91ZmLhQM7klOSfMbO/6tWV2ZKgQ02 +Cdjt7tEYKakGfmT21YT3q2f/2FF9TyarX9nma4RLnoNwt+GlH8bZFukr/Nkk2sf1 +jRZkYecdAgMBAAECggEAFW7Tu/yYfGtVgN8lbn5z5K3gcsj6f1f7S0yT74FDYNDd +Hn+O6cjFbBvlhTbydlKd1ncptbLauOAfMtQde1ODZ/OmgKQJ9aCt/39BP0ZvLt4u +Oaym2l9sol/8l0RrTn5++2kPxZZUTDTtKXRwax1orsMScLhx1Jd2zBzsGvS4JFv9 +anPRESNQK1c8I1ZBZH4372KjkKH4lsKURrX/Uf4Vxz7jz60zw0NEVNefewfmmz1f +fEd7F1He3Hb82r/n7diieUmrDiQnE4GwV8lsrtu8lss++89G2RtVOMlJ51uD+qOm +ToOCsRylFO8cLQ+0BsLHNKQsRXz7AtYMk+jn/W/L4QKBgQD2nfmu9P6ghaeP70YJ +HdFiUDDNzxDAs81Uj5Pty66pR05NIf1BSXwqZh8dmXI3kYOZohwaFMQOBWUwlXvi +vbpblnh8hiMvXxTgb1xPx+kEGSnkCLbiEjOEgMc7/s2iKXX/qH0Nw2NPTf44bKsr +juxxNthzSqGKulO8uyrrJ97NTQKBgQDJxSCH2XbpLThYQlQfRn+J/z29IKpC2u/R +e0nf9xmU0HDtfqxM0UXEtSBDZ2K4SRrT1w/mWmdkObw7O7JXMSnrevsL5A1qkFpO +6LrNtDRVZk4DjNo1z+KNc88WUZVu79IazTAWfWzX0dn/Khm+oB4ds0UkJhKUFhJf +xY1EZNDZEQKBgCSICjBsgjttEQE1RH6dOCMEFfamsaiZ+dSI4DTdcyYINgUe/9Dn +/ciaEAnmbRDmMURUyyzh3pjlG7QysINJ740ZoQdxJ00hHIqSdG4tAstkntv0noKm +h5MdMGYmvHdFBQG2B7A+PTvGJd5d2o09QrESmsWZTIysRTMz1ou3AD4RAoGBAJQH +7m/82kMFDDuknjc778J84vzpBEF8g0o7m92XWstViiSUNTE+sGM7R+pr5X+zEt2t +AVtNpGFiAnmquJND3K+JULpOnJE8SyVtle/pcCPfpQjxw/6LAHorJxoGzQ3RIWLM +e6VkbACDU97jMnQq4S2FIwr8a9D9yIk/VP+Cv78hAoGBAOGJ1LJhj9pMZeY4kmAA +L4qujX55bzs9Lk/+zKwE5RlwDpFzXzSXXHnWZeEyOb6ENyOnUpwT5gRyJFKidD1h +gtEx0PWclBbrf84Tz1GRurVmb+FuRe5la+aLb5Otdudnc+mggNGFoAOZMU8mQtoQ +s/bVTFKdN0+vYR18OTu3nGQg -----END PRIVATE KEY----- diff --git a/certs/nesica1.pfx b/certs/nesica1.pfx deleted file mode 100644 index 2bf3dac..0000000 Binary files a/certs/nesica1.pfx and /dev/null differ diff --git a/certs/nesys.crt b/certs/nesys.crt index 14b9f8f..70d71ff 100644 --- a/certs/nesys.crt +++ b/certs/nesys.crt @@ -1,23 +1,21 @@ -----BEGIN CERTIFICATE----- -MIID1TCCAr2gAwIBAgIUW3pG7ZaFPCJZC06IaUpu4LMNuukwDQYJKoZIhvcNAQEL +MIIDXTCCAkWgAwIBAgIUZvUOPy2SRMCgA7kLN+3K5pj6PUswDQYJKoZIhvcNAQEL BQAwRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExIDAeBgNV -BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDUyNzAxMzgzMFoXDTMz -MDUyNDAxMzgzMFowNTELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM +BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDYwNTAwMDc1OFoXDTMz +MDYwMjAwMDc1OFowNTELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM AUExDjAMBgNVBAMMBW5lc3lzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAuyJ+uz2BR7l9/Lh4TGpbQ6GSq0Zm0S4qf8VmYyanJg++/Ft+JHwtUdyWUhSm -w+/7VQAapQa2z60hpnv4X0GQeLD1NVt65zumQ0e8/aCYMa8gh4gZR9YVUSSJ15gr -JZmKaNxP4Dv71OGqvy/j2Lt0wCfKBcfCWjzZlDvwMRRPgZBmJf0sx/68vfDh+duM -1pGvYM8abBXF73b657i25WhXsP+H1zrcXzIFWsbf/bbGcn9MwEHGX8c5sx1tUYpB -c6rfm1i70y2vM15GOEDlZnFaGCEpc1126MYu22xgmPBuUC4MIEXa8AGBtK4ZsOx6 -mu0U5A9o+X5Q+xmtdhOMiapf5wIDAQABo4HKMIHHMB0GA1UdDgQWBBSOc9uQluEu -OChEmp0749hSeofSJzAfBgNVHSMEGDAWgBSU3G3LbEgiaaWJvr2ds14eNJcLsTAP -BgNVHRMBAf8EBTADAQH/MHQGA1UdEQRtMGuCDWNlcnQubmVzeXMuanCCDmNlcnQz -Lm5lc3lzLmpwgg1kYXRhLm5lc3lzLmpwgg5wcm94eS5uZXN5cy5qcIIRbmVzeXMu -dGFpdG8uY28uanCCGGZqbTE3MDkyMHplcm8ubmVzaWNhLm5ldDANBgkqhkiG9w0B -AQsFAAOCAQEAGwn7EU3OvDzRpuKqbABIFid5d2DXwVqwXvylg9RUU2X6O/OgbuiT -GNcWqGYYtGnys3Ti6T++5NzUGPqWVOzIqEaEp3ymuOE+4S8PRJAi1yTB6kcmY0M+ -AYvtIoCoomaSiHQmKHcztWTu6ENzBHkbg61EHMw2qW6YS8vfJdSnKUnKN9iRgTc+ -leixknpx16XjdzYqIjUO/XGArYCK6YexqQzYGGzCEDjssSNcVdpJMi+4IR+bi4gm -6Z07iJ2llemARincPI+8VXCrl7ubY1SjaHOxCVI1Y8dGIrlrRW3ZU6ZO7TCdhyiX -YnxSl3THxvdyic5whIL3A+sN5TjQcwNNbA== +AQEAyPW5EMLI0fxhkgW5NgL37C/pqG1Dq5lUR/vZeqAzOyi6WkZfq4CYIdQapnrB +J/Q0agnBWHZc9xORoLI0bGCwL3ipTc5rimO6626OCytGuyTJO5vAmDDbENNKavAl +y4mzVNCDHdY3Pt9GuF7yM8IhluOWWEbqTy/m+X4WI6NupXQWTw6Z+SAYywBzbOfq +qwiexb7R7DDTkP903tNLa+TNNA9N13Fjg0jqS9c+L0EcNVh2WwtkGIcDFfI656sI +Mu16mUmnZrOonAjryDDrjmMIYjAlhpI4XElonZxuoq0IRQVMrWOBJVkt7LMz2X/w +5NNm+1Pfxz6MXLv5dQ23Uo8jpQIDAQABo1MwUTAdBgNVHQ4EFgQU0gFjkf9oNqmN +t5R5wqV9ddXqi5EwHwYDVR0jBBgwFoAUdlf7M4BI/ELlCwTbk84NocX26+cwDwYD +VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAnkR/ZX3zDQaOZRCxaBJ8 +dMdAWVW7gKfUUUFn9icRAs8g2NnxhLAQ1Wj9Xet80OflqusUIz1kfbrdHDn2kQrV +2dwYTOaLou7xGK3VWZDdfsQ5jDd2bdW2EPU1UsN9/4okUBu19aUEoezgbL3tZbDr +XdIDu/e3XVRgCA2dMXaoh2ue/kJ6OcN58Jkf5pmgCCAvCFogvGZsK7VP+fGNovas +5Z5z/gZFb5QcHFM5r4U9k+XpHp8a3uhnXJk8KCiPY977TxLmlEARDmvvTMLmPhxX +rfDJOZglAMaR94wS5zyyWMxNNZImgsrwf6Jm+7iI3bJNPQxJOxB+9gRDSw/TYRr/ +sA== -----END CERTIFICATE----- diff --git a/certs/nesys.key b/certs/nesys.key index 9b83c2a..2bb11e2 100644 --- a/certs/nesys.key +++ b/certs/nesys.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7In67PYFHuX38 -uHhMaltDoZKrRmbRLip/xWZjJqcmD778W34kfC1R3JZSFKbD7/tVABqlBrbPrSGm -e/hfQZB4sPU1W3rnO6ZDR7z9oJgxryCHiBlH1hVRJInXmCslmYpo3E/gO/vU4aq/ -L+PYu3TAJ8oFx8JaPNmUO/AxFE+BkGYl/SzH/ry98OH524zWka9gzxpsFcXvdvrn -uLblaFew/4fXOtxfMgVaxt/9tsZyf0zAQcZfxzmzHW1RikFzqt+bWLvTLa8zXkY4 -QOVmcVoYISlzXXboxi7bbGCY8G5QLgwgRdrwAYG0rhmw7Hqa7RTkD2j5flD7Ga12 -E4yJql/nAgMBAAECggEAA8GcAJ8p7qojBMUhKQuDfHaMTqLRooZGNR1dwkS+2y06 -vK8Ld6kEcd23KLugY1N4XIrtff2GAuIrSD+5yxOyVjHbIjCNZYHVgwk4GnE0TN8C -jKXnOAFsmR3eJHU5/H26AQPXGJ2rnujOuBq6fJm6rLa/v+D0HkKVbXvMhPeu5t9Z -3BS74I1zebu9o+7SC3yApC3HH2aOuUV/w/9t2WVebXL6ymCyW8x7tUKRm8Kq+43N -rnY0ovTfCm/Z7iNPWApw2anAVxUeqMazKHmTqOq9t8lyDiEEdbHBlBAb9ozyKw5t -sqgzf1p88jWq6TcN1cNvgjiZEYA1njDkyWPleuQyeQKBgQDbtF6mxY5yA6koHEkm -a7YLJmILeW0JlbT/WL4SsF9zUzjst0cVFQXlqR/iNEEzYoxakABQWeamvbJaXgaT -DiVUwKkV8mPChI+fW3NDnwwUfWgrQfezwqNZczcgF43V/ZCNu6sskr8peINXbm9Z -WocyQua+VvZuTNC5cToJ6fBLuQKBgQDaDLMP7VuPra+rI6LyFSBPvD3n5TJLtXg4 -kS3aDIPRbY6DgiHBjMHejU4VXfwYUnKPR1aOaf+2BkW8c87mFP97ddyyqCrKKT1k -wscvD86fgWR3//RKpgufcKMAveyfhcblB4GlA0IXfbndn87BiuDSQJ14HcHziIee -oV86ReIYnwKBgQDKH+14VoYPJIkKKsOtgiiPp3dKASMsTzueM4FiZjraOXVEafUO -UzICsI5xqAtX/9EKPDLduWe2fQzJkHlR7xCvITQtybq3qQcM37ByRK9zZlBgg6ck -DOwFDjdn4eOOPGIx0rbPIg6WU5XZ6PKt7Ng2iFAKSq0amrbn9GAl4MA+mQKBgQCf -W/KuLEHjowOlJxlapbgErkXsKiT1Ef54ERqaptTcBZ7HXB8BjrbNySYNFbA9slwJ -fRC0aqG5TaI/1b+bhjMl7wDKDX+gWj2FW5kpOvs+tdlQnl7TA8Gw2Cg5TZUXDTVM -g4zrpZLzCi8B217HMpGW+CRd+hmau+iqNbQcKaDRbwKBgQDYPq5rUlUKa0wDK9YR -4Q9vmr2cl/ZuHxYIVgQGE3PIkg2mHR8seNz2gREunOji65gShk8LXYLXxImqVLU6 -hHuxPriob09igLOf3xEXCLdfTsyqc+4cJAomibLSF+PfyWqbRo8+XERm6XRrrg/N -rtB/aoYe7NB9OXK63jBdiNroxA== +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDI9bkQwsjR/GGS +Bbk2AvfsL+mobUOrmVRH+9l6oDM7KLpaRl+rgJgh1BqmesEn9DRqCcFYdlz3E5Gg +sjRsYLAveKlNzmuKY7rrbo4LK0a7JMk7m8CYMNsQ00pq8CXLibNU0IMd1jc+30a4 +XvIzwiGW45ZYRupPL+b5fhYjo26ldBZPDpn5IBjLAHNs5+qrCJ7FvtHsMNOQ/3Te +00tr5M00D03XcWODSOpL1z4vQRw1WHZbC2QYhwMV8jrnqwgy7XqZSadms6icCOvI +MOuOYwhiMCWGkjhcSWidnG6irQhFBUytY4ElWS3sszPZf/Dk02b7U9/HPoxcu/l1 +DbdSjyOlAgMBAAECggEAA1FvV1QBndn72gqtjRmnP03OBVs2GVPxFmkvPsn8+CnL +F4KyJ+V59y3TeZ+gQQkhGzkcnKadQ763RYuu6uhjyfAR/fgxDvo1LWSVBG3+Za7Z +tcBaGzxlrMiLiFCwk95EfEHr6ebnrZ2UXNn24ZzmEhUHt/hslcpVykiaYMdDiruX +worBxz6P0ajk9lxWhj1yuauLqoJtV9AYdplDk9NJa2BA74YMpkH2Gim1iDNDKfTw +Tq075hBAGeVMY2y8dYvX84wLvp9b/rUZOyM4TCvZgRsiNY6qXuIczHmh9IyASBlc +TI9oxfEpJa0h+ySa/Cnb3+OwRqdYjugbGhRiGloegQKBgQDwCZ60u3KstNw3eIcC +1D/G1ZbzegzPtfJCzDIM+JQ5pIHBLiqi+OfPkOzKCD1oFxSeXg+p/2giPBiGfUyD +cWBiB3r3mGvB+khpXJG02dM8JuQ5egSZHOguIaKRzQVDN49TjED9SNSAleXbFPo0 +kOag3tAgd4LA+iE1JL5f54dRQQKBgQDWUtjWE3ZtPZlz8HmVif+GUJFZnlW7K3R3 +lJlM9ISWz4ebzrrk5pgwZRVAbzgXGPcPLZEDS7BtyuwpWZ0e4+C5/QBGdywZVpHA +s9xKIWBAZsU8NBdZwNzF8wmutNo5cszqaNDRL7DTLsEgNTUOZ1xz789vvZhB/hFc +Y4wTLlHVZQKBgQCAyQiHe1LJargEYvw8/lfBfHNi6obZIot6X0gzQWN1kde0J+rk +SZtF+EGzG7ymjkuXtGu/D7N1Or0F21Aj7b6CmfTVxsd56ajULsBWQdBdo5grZlX1 +OFcx+QXaKB+8sqCJeOSdgGfTHZmXc6fScDPs996+rKBQnWMXukER/4zQgQKBgDsI +7vlouwI0KYSqBJOQQ3Y30xGgb3Ty703Q/LkZ0TvJRk1AkHJkoh8SeNwaxpR2J/di +UcNaoepcLtjk+kZ79nbEncLLKLaCBfvSjydMMjsLE+EVaCks2qMb4trgrguM96zJ +2lsEi+xfwIqinU6uYeT9dWIOE1Z6KUYNlZPi+l+RAoGBAL+0ATjUn3qV4Buo8frN +RuXqwIpYBPOHLVQHoEhDLdOiTvM0vElFnLq0Hq7wmuVSiiVbKSlsEZbQHRZlaChp +32YDqVxUYGEj5XnpBiCq3DTLru7Wr8r0njvKiBMNLOPPbtHukHnJFZL3gDTo96Ey +js/euYOMeKilOMkIURCKhw4P -----END PRIVATE KEY----- diff --git a/certs/nesys.pfx b/certs/nesys.pfx deleted file mode 100644 index 37d6f01..0000000 Binary files a/certs/nesys.pfx and /dev/null differ diff --git a/certs/root.crt b/certs/root.crt index 3d78477..496a003 100644 --- a/certs/root.crt +++ b/certs/root.crt @@ -1,23 +1,21 @@ -----BEGIN CERTIFICATE----- -MIID5zCCAs+gAwIBAgIUbw0ifSZQCKLKogc4QBn5x+0TaHswDQYJKoZIhvcNAQEL +MIIDbzCCAlegAwIBAgIUacZ68WtsoozH9w1+jlpguBVIh5gwDQYJKoZIhvcNAQEL BQAwRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExIDAeBgNV -BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDUyNzAxMzgzMFoXDTMz -MDUyNDAxMzgzMFowRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM +BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDYwNTAwMDc1OFoXDTMz +MDYwMjAwMDc1OFowRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM AUExIDAeBgNVBAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxtKwtk7ib6lzb0talDegOr+kBtPLkhYjXzJr -x94i7qptd5HCVkxC0ZVsH7Tinl+kECusQ/mZBCjfLlfqSR9BhdYnNiiudNGXhxBO -TK2nERqvs38aDxIv7IysTfazOhnzhWvl3fhZDX/FTi+W0UNXA32HgT1ucMzlvjMn -ZIZRKe+k7g/DJrWEZHwPnDpoHj0lIpF8iF7TY/n+CIGhPhjU1RBDShwCAXVc2n4E -HEuY/LlyvbcFWumsCDGRKvCwaKeC8mXNwiYQfe0aBFDGzJ9IWWXqTDJqj81+zuvk -BaaSLyCWD9KHeXYidYArYLUnxjKAMQH8xv6ciqRSgSrXJ4S+LQIDAQABo4HKMIHH -MB0GA1UdDgQWBBSU3G3LbEgiaaWJvr2ds14eNJcLsTAfBgNVHSMEGDAWgBSU3G3L -bEgiaaWJvr2ds14eNJcLsTAPBgNVHRMBAf8EBTADAQH/MHQGA1UdEQRtMGuCDWNl -cnQubmVzeXMuanCCDmNlcnQzLm5lc3lzLmpwgg1kYXRhLm5lc3lzLmpwgg5wcm94 -eS5uZXN5cy5qcIIRbmVzeXMudGFpdG8uY28uanCCGGZqbTE3MDkyMHplcm8ubmVz -aWNhLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAN7D5ug0P6sEa85NTb+9J2pt61umi -hFbES7wht9plgdVicCeRYQEaxpWlnAhZtXEI6MJkSK9zRTrd26Hyamz1zW5o639h -5vdnGP+HyJBOjHteqpc26dndF92yFOMwlwb8pzxPFW8PNZ0j1zbb8r4JYOoyUvCs -22/mKv993of3E8/DRERQaJ3dgWE4TTJGc8DXxoDyLcccFtBsBMyheNPHJE8G1oIN -B5Gwj8pq6Sqe4fx0IzQ+L6CyhMUFAEgE6m6LzgBMWZlPVJrq0LULDxYvGszBpQH7 -bSnvxvnyxAlFyFSjFphIq1gWbzSWl1R/vULIIVoFkfHlfS7SYa4l2m9Cew== +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoUvkzIO4WLknQUWA2z7/ZqrnwjRxKow27PHm +e6K6jTDcgEzKVljXCJV6TNWdlhU/jWoxqYmrQZJA8YGrUW3x9yUZB8WSusNfIU4m +5sLtTDTW7ivJbbOpSDernFBmemVnn9KGWuggp6LlH8Q+RzYEPWRszKNxC2lYNDKw +nLVRUIr8bKqVvzRDf+qk4lAV7WAJQW4SYzluOvf9ftSP54MwCexRIImnL9D/3OBi +4qxJrravaJdBWphd2r9WLUgOwTLN2f6p9NpTIbG+oOHsy/myW1cQw3i9mQM9jdK1 +rSzlgbqP5EmK6EN5aMhEy531d7zZBE1WDEx58dqArchVTmjo1QIDAQABo1MwUTAd +BgNVHQ4EFgQUdlf7M4BI/ELlCwTbk84NocX26+cwHwYDVR0jBBgwFoAUdlf7M4BI +/ELlCwTbk84NocX26+cwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC +AQEANnk5Tdl3+LM5KZEHub6zig/i5U+Hl9cCbkqPyX5yZNsKuUYg/Sc+5+neuhfx +agvoIFMwbpv5OmyNFuTKtzaBx/VWymANYM9+vaV1so8XqtCeHYKu2Skq3oV58LSX +h1tZPwtnGoVJgeG5d5fltWgb26K7e1W0VZlgZPKiwWM/nMRPQW1tfB6l6Yd6bCL8 +My4PKHDPIva86YHM1CDJAnAv52ZSG46aOulUT0RUNJXDrF2+mEgjJ7vxQSRyvUTt +UWF2S+v9CemYfR+ghvtr3hAo9rNtlkBvW+tvCA3lPbc1U8DJwAOGQ0a/keaEegk+ +9dmTRoOYNN6kJBpgg+WCjswWbA== -----END CERTIFICATE----- diff --git a/certs/root.key b/certs/root.key index 4b5331c..44b9d4a 100644 --- a/certs/root.key +++ b/certs/root.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQDG0rC2TuJvqXNv -S1qUN6A6v6QG08uSFiNfMmvH3iLuqm13kcJWTELRlWwftOKeX6QQK6xD+ZkEKN8u -V+pJH0GF1ic2KK500ZeHEE5MracRGq+zfxoPEi/sjKxN9rM6GfOFa+Xd+FkNf8VO -L5bRQ1cDfYeBPW5wzOW+MydkhlEp76TuD8MmtYRkfA+cOmgePSUikXyIXtNj+f4I -gaE+GNTVEENKHAIBdVzafgQcS5j8uXK9twVa6awIMZEq8LBop4LyZc3CJhB97RoE -UMbMn0hZZepMMmqPzX7O6+QFppIvIJYP0od5diJ1gCtgtSfGMoAxAfzG/pyKpFKB -KtcnhL4tAgMBAAECgf8umTLRh6uKgCyN6RtRobfsDP5kmz8a/hVMOoUIUwfc6BS/ -8Wma0ETY2ix9QefbNo89Ov8k71rtnqawNeqzOKAivg5yoxZASt84yJmRXyHI4HhN -mXyCC8Evr8iyfR+EfpCUtLUrUQmOIGQd7wlqAl5icwlPQRahWWR/L34MEW70ZMxH -ICtPgee5mbRFDRANlFi6b5ukndRypkWeChX35gqWpAJdHTsBXC4RIPBrpbhAWCIJ -Gw7udGJvPvroO1X1PwT2/dV029J9cvaVIrL9zZF/tmeMUPHEJbzEgBAGitgMKYQt -QsItG9uuwX4ZM4H0mFwuXguM6y0xq29IyPqHjhECgYEA0zKwoxkn6+jwV80Aq55C -Kyrfo4ChcXEiodKcbC2FqBYcZk3uAB2hiC6BwK//85DLHM1Z4xcwprez9+LLZOfA -WlWl0a5WFzhPvj8pBAXr9vDo5tns7wpT8/RVgGVa9BT0Ue7o1goShU3DFryo3TwP -Z3cqSObs9h5Dr1TyPSLK+vsCgYEA8P/20WREJEp0jbJnQFKS3w30rgbIKjUQBb0Z -rH+TIiJxUCqWI4Nw6C7vcANkpdqXXNoDIhsiVtqZsjpxDvXi/Qui+ip1L0AwwgkA -KKJsqbhbSt4hP2+/7VmS2Nlykw1YyzcygKMnu+liu6mfCd8IJnsBZ20GA88qwTxZ -nPFh4vcCgYB408lGpj+2sd+++6Pki3gjpjWoHxE+C5Hartma8jhDP9MjnHYLTuh5 -NtI44Pg36qCpa7p/N2c4GmU17mSa6BOeGt3xJiJOyoKkvxHCIXksIAu+9vKcl3YM -Xb8E4/ezKMHWli5TNhP+e8yfF3Qsjg3qDbz9VFBBRnNGvfyQiXVDPQKBgGzVawUM -nqk05oXG91HY+HK6vrCIZ4SICgBNcXaw9iUIINvvH3ZSOX7hE0gmgCFWIdzQp3GT -h2Jpvdb7BWuYJzXXN3Z6DgmUl3BI2EWBdEkA9FlPDvyy3p21Qdej+1XlRSAggTIO -fDckIm5VH3k5u1iFXBD07y5xNAGn22BAsc/pAoGAapcQqbqxC5gLhbif+tvS/MiT -ce4rXBUyijwmul1WEPw2ffOmW0F0tUhEY+uLxNMianxbvrM6GajsfnNI8kJYNrck -RoK+bvMJaE0hA9J+vH6em2927TXY8vxPJ1eBSVeP0YHoDJvIExdiw5At1PxkJwac -Q1OFS6nnyx6AWdcikzQ= +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChS+TMg7hYuSdB +RYDbPv9mqufCNHEqjDbs8eZ7orqNMNyATMpWWNcIlXpM1Z2WFT+NajGpiatBkkDx +gatRbfH3JRkHxZK6w18hTibmwu1MNNbuK8lts6lIN6ucUGZ6ZWef0oZa6CCnouUf +xD5HNgQ9ZGzMo3ELaVg0MrCctVFQivxsqpW/NEN/6qTiUBXtYAlBbhJjOW469/1+ +1I/ngzAJ7FEgiacv0P/c4GLirEmutq9ol0FamF3av1YtSA7BMs3Z/qn02lMhsb6g +4ezL+bJbVxDDeL2ZAz2N0rWtLOWBuo/kSYroQ3loyETLnfV3vNkETVYMTHnx2oCt +yFVOaOjVAgMBAAECggEABjDnDdCKfWFR9+fmi8PNws+RiLtBkrwCCbM5QQqcdXno +JMaNx6WuT0aJhLR4UX/sSg3G7TZ7C8/EzWBIRp5dOLrETK+RM7j3CEy7IoVd3Vxz +2X11xE+ukjaM0DmnzU/iG9jVTlz1j+mpOMBsEYipvf+CS5KEbscy2wINFF7DSb+U +Q8oMGDne7AoXyh3SvPCuPJK4gZq5usjG7XL8nYACaVmCotbrjmG633yBArMjQMet +Wtjq5jpVvGHa5AvOlxeh1eaQnDQVzvirURIZo9K/rmgKDMV7muUiq0K8KKmTld80 +/6CelYikwg7jI0IRy6AP2kL0/e3KfBrL5HEx4ErzgQKBgQDh+57z1St4rAW4RW2H +IWxofPeNrgBC8cFUm8GrIFw5T6xh/q0DLxU1IczUxWAOP0NnQG7qdMW84RGM3aSw +kh9msi8wiYaHMecvFflz3vsTWEhjY/ocdhIcWfFCpreRo/+fpAUJzpEU4VTiW/Wh +6+E30Mmb/FcW1zWlPk/X+h9MlQKBgQC2uKi5jDTx6olMdTwHD5Xhd3qhx9/VMDqB +YKpezOO0FUpD3spVM/H1P4qTB44U345WtRR4KVKbaCPPh3A3EF6rIkYv0BwTrZe/ +p6qTSq8woKzUrNX1uA9ZPLGGOBj/dDeEV4KC0Jp/hzt+TlujUDxdCLBtskBZS0LN +khAx3mfbQQKBgQCgQ6Cw8EcKJ4VO7/4DTZLib23pDrOkxmsDpAqvYB3Hj1eDj+gH +UAbMTZJEe03qDLeyrCF9KR9rGnsl2bKIfrjCTi/lTkMX8i4wWHc207ZgO8Xqpuaj +9KBXdvoA+NdK9HG/N8VS9SozErLubaVAFlb9DJdOhqEE0895xz08wGgeGQKBgAX/ +Q5JrdqVmBEGdK24z5cBzsnOy4rbVkWYDrTPVV7fmZvyZSFzJiqx4/Gxc+B3ZRIu1 +/8j92jc9kMdT86vq/qBxTIpvMyy2Kt/geenBrsRS0bldPtyEwQQ1yMHV/4QK5XOT +h7YRcLC02JAJtFpE3OZUza2cBx6nKLckjyGD4jbBAoGBANQDkmYFJ4m54rxdaRms +vjORG6ncxxucQbX+A5vgFUUXzRhB0qQre0pmLBJb2TZWyldN5botq9LEWVLS4NLg +y3l0SY1Sl7Ax0ZH+uZVb9E/BSIytkcp6AbcGgIRvAISHO7bGiUORO8BBFkHmxuYG +xbK01G+eU/ZsrBbpjeDrehHY -----END PRIVATE KEY----- diff --git a/certs/root.pfx b/certs/root.pfx deleted file mode 100644 index ce42dfb..0000000 Binary files a/certs/root.pfx and /dev/null differ diff --git a/src/main.rs b/src/main.rs index 7385e72..daac760 100755 --- a/src/main.rs +++ b/src/main.rs @@ -59,12 +59,18 @@ async fn basicinfo() -> HttpResponse { #[macro_export] macro_rules! resp { ($str:expr) => { - HttpResponse::Ok().append_header(ContentType(mime::TEXT_PLAIN)).body($str) + //HttpResponse::Ok().append_header(ContentType(mime::TEXT_PLAIN)).body($str) + HttpResponse::Ok().append_header(ContentType::octet_stream()).body($str) }; } #[get("/alive/{id}/Alive.txt")] -async fn alive(id: web::Path) -> HttpResponse { +async fn alive(id: web::Path, req: actix_web::HttpRequest) -> HttpResponse { + println!("---"); + println!("Method: {:?}", req.method()); + println!("Host: {:?}", req.head().uri.host()); + println!("Path: {:?}", req.path()); + println!("/alive/{}/Alive.txt", id); resp!("") } @@ -116,6 +122,7 @@ async fn game_info() -> HttpResponse { } #[get("/server/certify.php")] async fn certify() -> HttpResponse { + // Need to let res = format!( "host=http://10.3.0.53 no=1337