From 75313ccdfaac24c18aee565c3c9e5109b0252bf0 Mon Sep 17 00:00:00 2001 From: caret Date: Sun, 4 Jun 2023 22:04:50 -0500 Subject: [PATCH] Cert issue fixed probably --- certs/install.ps1 | 18 ---------------- certs/more.sh | 17 +++------------ certs/nesica1.crt | 34 +++++++++++++++--------------- certs/nesica1.key | 52 +++++++++++++++++++++++----------------------- certs/nesica1.pfx | Bin 2723 -> 0 bytes certs/nesys.crt | 36 +++++++++++++++----------------- certs/nesys.key | 52 +++++++++++++++++++++++----------------------- certs/nesys.pfx | Bin 2739 -> 0 bytes certs/root.crt | 36 +++++++++++++++----------------- certs/root.key | 52 +++++++++++++++++++++++----------------------- certs/root.pfx | Bin 2739 -> 0 bytes src/main.rs | 11 ++++++++-- 12 files changed, 141 insertions(+), 167 deletions(-) delete mode 100644 certs/install.ps1 delete mode 100644 certs/nesica1.pfx delete mode 100644 certs/nesys.pfx delete mode 100644 certs/root.pfx 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 2bf3dacb4cecda836ff985c38c2fca1c96214617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2723 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 R1h0+(Ph=Zbr~QN4zX4J+0wn+d 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 37d6f01ec66e539b78ad0ff6ea5c16e623d97759..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2739 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 f)&c>HNF3CaiA5&nPRtQIfEn-{ z2StH!P}85-2#EuY|64IV$AP+kqIMvF;pb}pw*eq6e+4i*QXeV(Z)8J?fFRxlWq+1D zv(EzpAq+@1CdhxU0a?Hd$n#7rjxl!tu8bgn42ZKk*9|3Pl~0_M#!T_x{UW1qAd|h} zOSW(SKuPhSHS&qE@_pH{^~%;SYh&#HtOV+c6OLUC*F`C$VI}r$euUqp2|-c^YU&W1`CbY32Vq% zyj{}OFZp}a@Kc7oYRHG70RJ5-|EV}pQNW|hM4Oxz!2qqBxMJ}U*su5z9VQw>!)sVP zG4Sj=?tY%0c`%}G_`CP{{xx#@H0_h0-X~wI;ihJ_{qNWnxI}n1QgEzFW&(aES8|9c z)Tw^WqKz3Yc!kE)k4aq&<&vhp6`h_8OD*9_J7^FueV^6+RB2zIh+>@*raY1jaPE_~ z+1#k=+ZWnsH*<;c4@6UQd|PnYwv6;+fe|}KgXjWhR5*aH5} zOdL4ko0bDrayMp0IW@qm>?nnDfsZMt3q=2k(-OuYTJHLrVJy}fJJco^5yxDmoqY3T z$HD82RbtSUy~NgU_yxEz#84pMfGsfOM5hidL8vp^b_Y5goiaTh-Y^8HiOeX<_DYBC z1`g5%l7bj-2Y1?Ue_UQxNaf?s)sX_SgR5E-i;9Ic5lwRW(8LpmKQ?Dczh72+aYw&p_5CPk zEL9L<0!Jv}ovED(nk!t*6>r)4wADxB& zE4WINHXv$>rXPOc=pDtX)(eCKb@Z_zFnGsypo4$8N+T;wV=~d15r3y6j)f(0-g>um zBHnJy15xq=81Lmu;pezcW6iT!^z7AR9;21tOt^}5hC^mTIIeBQWt=Zn0@4G)&sBV_-#a)90x8tlL-3H}lb3U9nzWOiC#UBqb3z@G{_Ild5 zyxLnfXJ^f4AO`Cl4uu;#78zxBS`ytGM@nU?r>($(>~h$_vDd4NXuvjL>r}0uBc-a= zjj;GaM&BXr{klx44(0K;edVSkqZ`x|!}IkkbVBmnJB?^Py3GiTK0s8BAjx*%`U)## z?XIC$&Rt<6;X8Rvg*A**c2N`YVw#s`;Djc_(wy%PDNBO_d*3D;0X2%D;abSE*tucX zVE*ULqiGxCT)l_X)&NeK?25dClD|oo^|Uk}(d8BX7q@CmJusUBauQl{^*UUnODEFT zu4QSLAoGd3^_Sp2x#+X(-^uh+hKw|H=@0s;3o)895@UNxPt4$exL3&Z>xHo5(jyd~ z@14EdI1Ft z?m3t%28>F8vWKx(&%K1D(+bBw&+8usz@)q0H^6_;rkaxrW|#SV(9S=~*D8Cz8eE+6 z>Mn$~jqJ!)(r<()%wEt z-fa&yCbM@{gKt0BsJqxVtR?SAXJ*plCAU^B4@JQR5vbq41=PLq%kfB6m4 z@x)2zH)i(BVu*BJLvW}-a*DT(4nFNAL8+M8@e3n3O+!kV+rLx?#16>))C3=>w-{Pj zgnxV@+*$jhh=G_LepKBxNbdCbUTm=SCUFaTW~!VXAL6TKTg9%h&h6KOX?y(bN`1x# zOgL~rh2V6##T*wzDTh)`DG39z*LdTCUkP%oo%bYU2w^z^S-G~MM++~S)+R`>`tPco zHW;%>y!Y(=2M_vnlZxh3Z?E>(d!Ukp^5#@lMe*WlDe;W1vGm!?f zyZIi023|k_o|$SW>!>>dRfV`zCV`IouG@t5NyXmi37k30sEA+5t4C1*l@%TBcaFUS zR9BeX3c{mY8dbWn%#-(6hc`LH>u@b&PH5v%*_`-P|EJy|vr&o?NU>i+W#Lui1M%Fi z@$}hc{q|;M>&Gf{OSqo>O|LSfE>aQ6{_EWX0>BI)c*78h?v^akKgQDcdYm@@N!Vdt egv 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