From 393d89f15ae7e45ba2016e04ca6d3b9222c4588a Mon Sep 17 00:00:00 2001 From: caret Date: Thu, 25 May 2023 21:59:30 -0500 Subject: [PATCH] Certs fixed --- Cargo.toml | 5 ++++- certs/cert.ext | 1 + certs/cert.pem | 18 ++++++++++++++++ certs/key.pem | 28 +++++++++++++++++++++++++ certs/more.sh | 18 ++++++++++++---- certs/nesica1.csr | 34 ++++++++++++++++--------------- certs/nesica1.key | 52 +++++++++++++++++++++++------------------------ certs/nesica1.pem | 18 ---------------- certs/nesys.crt | 19 ----------------- certs/nesys.csr | 35 ++++++++++++++++--------------- certs/nesys.key | 52 +++++++++++++++++++++++------------------------ certs/nesys.srl | 2 +- certs/root.crt | 21 ------------------- certs/root.csr | 21 +++++++++++++++++++ certs/root.key | 52 +++++++++++++++++++++++------------------------ certs/root.srl | 2 +- src/main.rs | 13 +++++++----- 17 files changed, 211 insertions(+), 180 deletions(-) create mode 100644 certs/cert.ext create mode 100644 certs/cert.pem create mode 100644 certs/key.pem delete mode 100644 certs/nesica1.pem delete mode 100644 certs/nesys.crt delete mode 100644 certs/root.crt create mode 100644 certs/root.csr diff --git a/Cargo.toml b/Cargo.toml index f729875..bb90ef2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,9 +6,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -actix-web = {version = "4.3.0", features = ["rustls"]} +actix-tls = "3.0.3" +actix-web = {version = "4.3.0", features = ["rustls","openssl"]} +env_logger = "0.10.0" log = "0.4.17" mime = "0.3.16" +openssl = "0.10.52" rustls = "0.20.8" rustls-pemfile = "1.0.2" serde = {version = "1.0.152", features = ["derive"]} diff --git a/certs/cert.ext b/certs/cert.ext new file mode 100644 index 0000000..9ccb011 --- /dev/null +++ b/certs/cert.ext @@ -0,0 +1 @@ +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 diff --git a/certs/cert.pem b/certs/cert.pem new file mode 100644 index 0000000..01a26ea --- /dev/null +++ b/certs/cert.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC8zCCAdsCFDZ+Tm8tk3VYtBpdHnKbXA8YPPztMA0GCSqGSIb3DQEBCwUAMDUx +CzAJBgNVBAYTAkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMQ4wDAYDVQQDDAVu +ZXN5czAeFw0yMzA1MjYwMjU5MThaFw0yNTA1MjUwMjU5MThaMDcxCzAJBgNVBAYT +AkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMRAwDgYDVQQDDAduZXNpY2ExMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmhbbsXne6zLyGTFESQUJvWh +Yb4PI7B1J/+btHgMMBCKB71sBVR7O7+G6+tO/iotTxzSFheunSUT5eVWJodMAh7x +2UwWcWZZhdHbzqTaUikCkQW7UGN+/ApoG1dGBAk5DSa9Fn52T7QYcSzcFIAFMIY5 +8yVYj9/22rkY/Bkof1TWT7B+/WckwoGYB6/2e6XGz74ly6sMURGRBySB7rm0BqiW +yIz9Rt5Kr4ZdAtUGziyNpDKClh37OLvOupGPSE8nAafKOrhidrRnc2APYJOQTDEi +chak4Pi87KiqvN1pjMdJQBsEyNgC7OkziJ34O2ZhpXFdATe8mxmjhL3T738A3wID +AQABMA0GCSqGSIb3DQEBCwUAA4IBAQA6APfNroAJiNCO4DfcoKA0K/7fX8F/+18L +KbXywW7iv8g6PHcZCqtI9UcJ2pnczMQxNwRPV+guxzHgKJY916/fdLXQeGyDwEo7 +opSnrcko817cDcpQMDQpEM/2CnNEf4sEal7UDbesmRWVSBhCsmcR8t5UlMxjUdO3 +4v2k8vxqoYj4Y71tyHC2GjmbVAp+20o+nLxGe/FM0vKDYAGwVwuchW71q2gymxCk +G0eNShalMxVozODpBQX8BTyOkFxB9HUt+n8FrG4wHeKcmLiOHinCUqwph/1Qo9Ld +cTYjpgmeXMnFeYPgeBDALAQcGsDpRGw8tcaNXYZTEDDa29ZCIHnn +-----END CERTIFICATE----- diff --git a/certs/key.pem b/certs/key.pem new file mode 100644 index 0000000..d22ed14 --- /dev/null +++ b/certs/key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCWaFtuxed7rMvI +ZMURJBQm9aFhvg8jsHUn/5u0eAwwEIoHvWwFVHs7v4br607+Ki1PHNIWF66dJRPl +5VYmh0wCHvHZTBZxZlmF0dvOpNpSKQKRBbtQY378CmgbV0YECTkNJr0WfnZPtBhx +LNwUgAUwhjnzJViP3/bauRj8GSh/VNZPsH79ZyTCgZgHr/Z7pcbPviXLqwxREZEH +JIHuubQGqJbIjP1G3kqvhl0C1QbOLI2kMoKWHfs4u866kY9ITycBp8o6uGJ2tGdz +YA9gk5BMMSJyFqTg+LzsqKq83WmMx0lAGwTI2ALs6TOInfg7ZmGlcV0BN7ybGaOE +vdPvfwDfAgMBAAECggEAC4wchO8lu/2CsbJm3M+HyovuJWppkCRigj0iD6Nt0Bzc +9AYrbmdThL1KFv+8U1AapWnBiVetHLx1gB9w00ls4PbOO5AXYwJoGhmIBh/q8Qbb +/xVREbVp0ODdqEe1hObOXf+c4ca4v5rEi5/Vj69adqS/ezbhSz53Hci7LdOio8/Z +6i8aZZu0c7bvcYw89nKqHrtJ53xQRjJ3aQP8Vc7UvjKOohbX5I1K2dzriouSx1HG +7q273ZP1rKs5s49fQXPBH0sVRPa7W1aEgcNI8Kkki5ulx7rSd4sTFy4ltCxGAXeP +n+SfFFxKQz05zSbBjiiRwMTVVQDpcfdm8+sr3LAUDQKBgQC4dF5gCIL9q1fqcWJl +u0VMlxgQ9mvLsFUt/mLdzTbvjPIrfuukNw4FOfkAgX95nQcjM3nr8STd7DKZyV3M +VhP4A1iiswAOETy/N+SbAm3rL4ZrERoqWARcjvaDMos3LYZ4+h4anf4TlKueVsfW +46qeBF6E+UUgLGZARFAoKeY9wwKBgQDQv0KFsml6sITsHmv3Iw0VIQuau9jeqK+v +3PRZoOELZmN4AAJGMNmwX90eqboFoQ19WCNHynRocP8GWPeUmp3CPHKwxm3M5psa +Q682zm8NtReHGblvWS06OAhzsMmAAHyeIk8WIM8q7EzlO/vl0W5HfdXPDyJ9wiAY +hNRbXTHytQKBgEbST2YZ/ol9X10hucELvVjh7pictNjZVGs7cCRvZbdma5ktuzYq ++VQiZSu/jP1ZwGLQofBof1pCFU+c1Enfhv1D86VMiynbjnJw+HJX5XJWpgq3308A +ynPrZFUNdAx0i1wp1KMtpF9KRvadpU8pzNmtHcl6mAL5aS0lzY0OQVvXAoGAWREy +Vg9w+Bt3K7QzRuiavWgzJlt+RkrdY4E4dUGypAWU7W+7iK1xRNMyatHqgFpeghvo +OcqFbsa/2bp+MNbj9yuJmCmiUeoXRdaZXR4pvkSFfGyadYssRAoCeTJ2V3pdsa9b +5UosetkGWk0ExuNcVX64irefdN8uiKesYCtck30CgYA7CnK1V7urPzpuSaodWpQq +xgxCFryRwcZraoP0gD5dfIPH/4fFX4hbtNYVqrPy4hT/bvmdgobrHCzQW+bZGqd4 +NCzoB1mTONTR6ZQmOwG8+6/7ZghLekCLahb0VDk30Onh1EkTphx2spEwZBOPDmrl +2RoKZxFSDiIZAMmjq5uVgA== +-----END PRIVATE KEY----- diff --git a/certs/more.sh b/certs/more.sh index 616d871..1891911 100644 --- a/certs/more.sh +++ b/certs/more.sh @@ -3,17 +3,27 @@ echo "This script removes all cert files in the directory." echo "Continue? Press enter!" read -rm *.key *.csr *.crt *.pem +rm *.key *.csr *.crt *.pem > /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" +openssl req -newkey rsa:2048 -nodes -keyout root.key -x509 -days 3650 -out root.csr -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.csr -subj "/C=JP/ST=A/L=A/CN=nesys" -openssl x509 -req -in nesys.csr -CA root.crt -CAkey root.key -CAcreateserial -out nesys.crt -days 1825 +# Sign with root cert +openssl x509 -req -in nesys.csr -CA root.csr -CAkey root.key -CAcreateserial -out nesys.csr -days 1825 # Generate Last Certificate and Key openssl req -newkey rsa:2048 -nodes -keyout nesica1.key -out nesica1.csr -subj "/C=JP/ST=A/L=A/CN=nesica1" -openssl x509 -req -in nesica1.csr -CA nesys.crt -CAkey nesys.key -CAcreateserial -out nesica1.pem -days 730 + +# Add domains +echo "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" > cert.ext +openssl req -in nesica1.csr -out nesica1.csr -config cert.ext + +# Sign with nesys cert +openssl x509 -req -in nesica1.csr -CA nesys.csr -CAkey nesys.key -CAcreateserial -out nesica1.csr -days 730 + +openssl x509 -in nesica1.csr -out cert.pem -outform PEM +openssl rsa -in nesica1.key -out key.pem -outform PEM echo "Use nesica1.pem and nesica1.key for the webserver!" diff --git a/certs/nesica1.csr b/certs/nesica1.csr index 6403790..01a26ea 100644 --- a/certs/nesica1.csr +++ b/certs/nesica1.csr @@ -1,16 +1,18 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICfDCCAWQCAQAwNzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM -AUExEDAOBgNVBAMMB25lc2ljYTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDHG1bIdtuplWdnQcwnAaKRymPZEe5vMf4Rq4SvtZn+dEIlmRT9V5Xwc+k5 -hUcyLPHacacF4BlmqLYfinTgNZ6en+zo3lve4xudUbWFqs1Lyfl8QpxkYEAcqYm/ -12s67awiCsiLgxGCpx2r5uANajF3+fJor04iJvSY4Dx6bPq+al5rzyvjuu8QEmrE -auzxP0UFVJZaTmWvsjL862AlCJ10gBEp/NTg3/O4WYzfdpiXE3OcCfDxMxCA1ItJ -Su6RJjn6b5m7U6lFnnmWApfoNRWfiD6yXJVAHtzBFQjV8LozvDEXieTHFeNledrA -JndDRRFhYVkhahCCzHe+JEgyt0RPAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEA -Ee9mTgB/nTcRmKCZ+bACVuBUxilFLwZs0qtcuOEcUw2Pq1zAEwVXtSksbOtMH0US -QXs8scRhf2t3Hq30Vwg/Kpb0XKzXf5uitIJR6FQjzQs80Lhc0V575OBpnnY9apJG -HPqxOT3RylqkhgUYOjD8UbUS6NydrxPPhGSenKSamG3vnlOUhGeFEpYaCuvSq1di -RZ7IUaidHPtSL6zLOlO/ZubrgtMwrU2T+ZrL6iVG6GohFqnMAdilSiB+z0fQ9Qq0 -tb5nRC1ghhy7JJAW06lwhVY+98Kd1pDubJjjwa9qxa3BsrT1DrVE5KCCIwF3tCrQ -Trv0kFEJQSK6ZXNW9MhwyQ== ------END CERTIFICATE REQUEST----- +-----BEGIN CERTIFICATE----- +MIIC8zCCAdsCFDZ+Tm8tk3VYtBpdHnKbXA8YPPztMA0GCSqGSIb3DQEBCwUAMDUx +CzAJBgNVBAYTAkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMQ4wDAYDVQQDDAVu +ZXN5czAeFw0yMzA1MjYwMjU5MThaFw0yNTA1MjUwMjU5MThaMDcxCzAJBgNVBAYT +AkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMRAwDgYDVQQDDAduZXNpY2ExMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmhbbsXne6zLyGTFESQUJvWh +Yb4PI7B1J/+btHgMMBCKB71sBVR7O7+G6+tO/iotTxzSFheunSUT5eVWJodMAh7x +2UwWcWZZhdHbzqTaUikCkQW7UGN+/ApoG1dGBAk5DSa9Fn52T7QYcSzcFIAFMIY5 +8yVYj9/22rkY/Bkof1TWT7B+/WckwoGYB6/2e6XGz74ly6sMURGRBySB7rm0BqiW +yIz9Rt5Kr4ZdAtUGziyNpDKClh37OLvOupGPSE8nAafKOrhidrRnc2APYJOQTDEi +chak4Pi87KiqvN1pjMdJQBsEyNgC7OkziJ34O2ZhpXFdATe8mxmjhL3T738A3wID +AQABMA0GCSqGSIb3DQEBCwUAA4IBAQA6APfNroAJiNCO4DfcoKA0K/7fX8F/+18L +KbXywW7iv8g6PHcZCqtI9UcJ2pnczMQxNwRPV+guxzHgKJY916/fdLXQeGyDwEo7 +opSnrcko817cDcpQMDQpEM/2CnNEf4sEal7UDbesmRWVSBhCsmcR8t5UlMxjUdO3 +4v2k8vxqoYj4Y71tyHC2GjmbVAp+20o+nLxGe/FM0vKDYAGwVwuchW71q2gymxCk +G0eNShalMxVozODpBQX8BTyOkFxB9HUt+n8FrG4wHeKcmLiOHinCUqwph/1Qo9Ld +cTYjpgmeXMnFeYPgeBDALAQcGsDpRGw8tcaNXYZTEDDa29ZCIHnn +-----END CERTIFICATE----- diff --git a/certs/nesica1.key b/certs/nesica1.key index f64c8e7..d22ed14 100644 --- a/certs/nesica1.key +++ b/certs/nesica1.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDHG1bIdtuplWdn -QcwnAaKRymPZEe5vMf4Rq4SvtZn+dEIlmRT9V5Xwc+k5hUcyLPHacacF4BlmqLYf -inTgNZ6en+zo3lve4xudUbWFqs1Lyfl8QpxkYEAcqYm/12s67awiCsiLgxGCpx2r -5uANajF3+fJor04iJvSY4Dx6bPq+al5rzyvjuu8QEmrEauzxP0UFVJZaTmWvsjL8 -62AlCJ10gBEp/NTg3/O4WYzfdpiXE3OcCfDxMxCA1ItJSu6RJjn6b5m7U6lFnnmW -ApfoNRWfiD6yXJVAHtzBFQjV8LozvDEXieTHFeNledrAJndDRRFhYVkhahCCzHe+ -JEgyt0RPAgMBAAECggEACzMKzvHTP0G2dETA3VImjnl046kyNoejA+QYQuM9yztH -ho01dLPwLNCdm20CE9zFVIU0tjbkbDWB26+nt/4sHZNfTxCa2E8BUaMJSSsnVbkB -qISn/q659yLDgHVMhHReofeQpOWgHto+6AQaMYb59gaqz5/0uXpkIxPnMvey+Zzb -3yreGi+3kZ3BkWPMgvwcsX3C0f2Z3zlwnBskWxCg9nfgu4R2k/X+hHfIJmtvaJ++ -NvV6kLZMSGIMIns2A/Xd8tDuQoNsXl7y+0QGEz+GSYucqJfkrc61uhFgbYHB6xnZ -xC82Xtr4vMNuoo0CEt5VoQnILY5LMFB2FJ4A/Hf62QKBgQD6KyfCDVMkGz1/apnz -d+obRojHf/s04HSxbr9mEjWhlTSWJDd2Gm0mQEpBB96/5lFFsr9RESPHfzpJuhgg -X8hPHr4Dn6sAMjJ7xAvzjbv3M4uMxxIAbnbDnXC0hir+RxN8HP3Ceig0/D2S/ofd -ARkONCoakBa0ovHuYIAsw8sNmwKBgQDLv3rbWrZIj3zlTIbWJCAyxxMtM1M5LaRA -PQ2kr+8/ENgGU4lczR8uDxtEd4hBmHz/3cjo6zoQaDJ9zTCAnC65S8Oo/VVDrSEg -sKzpzao/zBVzJiqGWUe9arlWQ6EzArB4jvo8f/5aeDlV/m62C5sFgwuYJv6hNV2Z -eMPq7WipXQKBgQDoiXC9ahFcQI3bgEV2EILls5y0hHwG3JTb0SvMPyTm+4AUB7od -59aJdb0P0bb1/aqR9OLtAdeWOub9XSPMA/x3vwW07JfQ6NgQP100mQydbaZLx0cu -a3+tuQzoYMZZ8ctk1LX0LgRtrAG4Pywe/ERD9a0lX8YbRlNH1x+NfLmj/QKBgQCH -kd4WjLJTb55EGHpzjFAcWVgKMGeE2Ti8QaONXD9N8FA9TWJN7HJ9vDGBiiOQuf0a -ZyFi0fmtpxdJm7lVKhbw1lfXXtFYGZ+8V7KGU4Gft5TiLJgJEujoQVYW7yMYhQaV -AVXB4cyFuA82h/h0ix5YOY0CbZfp/k9Mag26iMOmRQKBgQCOW4bh7JWVdJnO+FIr -oCic5H8Ump+e/cPc9pUf/CyL8XeoVAHnrpMrNwmzwb0Y+OeTwgyXIA3FtumSp/Bg -i8Cay1LrO0FBL6xJchCiGEyPgZS9eFkTk0sOt1ZHPFSbo5+ZPkFgTuiPXBGKC5ZQ -YShRiOgxOk0rXpE65wCXtK6bBw== +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCWaFtuxed7rMvI +ZMURJBQm9aFhvg8jsHUn/5u0eAwwEIoHvWwFVHs7v4br607+Ki1PHNIWF66dJRPl +5VYmh0wCHvHZTBZxZlmF0dvOpNpSKQKRBbtQY378CmgbV0YECTkNJr0WfnZPtBhx +LNwUgAUwhjnzJViP3/bauRj8GSh/VNZPsH79ZyTCgZgHr/Z7pcbPviXLqwxREZEH +JIHuubQGqJbIjP1G3kqvhl0C1QbOLI2kMoKWHfs4u866kY9ITycBp8o6uGJ2tGdz +YA9gk5BMMSJyFqTg+LzsqKq83WmMx0lAGwTI2ALs6TOInfg7ZmGlcV0BN7ybGaOE +vdPvfwDfAgMBAAECggEAC4wchO8lu/2CsbJm3M+HyovuJWppkCRigj0iD6Nt0Bzc +9AYrbmdThL1KFv+8U1AapWnBiVetHLx1gB9w00ls4PbOO5AXYwJoGhmIBh/q8Qbb +/xVREbVp0ODdqEe1hObOXf+c4ca4v5rEi5/Vj69adqS/ezbhSz53Hci7LdOio8/Z +6i8aZZu0c7bvcYw89nKqHrtJ53xQRjJ3aQP8Vc7UvjKOohbX5I1K2dzriouSx1HG +7q273ZP1rKs5s49fQXPBH0sVRPa7W1aEgcNI8Kkki5ulx7rSd4sTFy4ltCxGAXeP +n+SfFFxKQz05zSbBjiiRwMTVVQDpcfdm8+sr3LAUDQKBgQC4dF5gCIL9q1fqcWJl +u0VMlxgQ9mvLsFUt/mLdzTbvjPIrfuukNw4FOfkAgX95nQcjM3nr8STd7DKZyV3M +VhP4A1iiswAOETy/N+SbAm3rL4ZrERoqWARcjvaDMos3LYZ4+h4anf4TlKueVsfW +46qeBF6E+UUgLGZARFAoKeY9wwKBgQDQv0KFsml6sITsHmv3Iw0VIQuau9jeqK+v +3PRZoOELZmN4AAJGMNmwX90eqboFoQ19WCNHynRocP8GWPeUmp3CPHKwxm3M5psa +Q682zm8NtReHGblvWS06OAhzsMmAAHyeIk8WIM8q7EzlO/vl0W5HfdXPDyJ9wiAY +hNRbXTHytQKBgEbST2YZ/ol9X10hucELvVjh7pictNjZVGs7cCRvZbdma5ktuzYq ++VQiZSu/jP1ZwGLQofBof1pCFU+c1Enfhv1D86VMiynbjnJw+HJX5XJWpgq3308A +ynPrZFUNdAx0i1wp1KMtpF9KRvadpU8pzNmtHcl6mAL5aS0lzY0OQVvXAoGAWREy +Vg9w+Bt3K7QzRuiavWgzJlt+RkrdY4E4dUGypAWU7W+7iK1xRNMyatHqgFpeghvo +OcqFbsa/2bp+MNbj9yuJmCmiUeoXRdaZXR4pvkSFfGyadYssRAoCeTJ2V3pdsa9b +5UosetkGWk0ExuNcVX64irefdN8uiKesYCtck30CgYA7CnK1V7urPzpuSaodWpQq +xgxCFryRwcZraoP0gD5dfIPH/4fFX4hbtNYVqrPy4hT/bvmdgobrHCzQW+bZGqd4 +NCzoB1mTONTR6ZQmOwG8+6/7ZghLekCLahb0VDk30Onh1EkTphx2spEwZBOPDmrl +2RoKZxFSDiIZAMmjq5uVgA== -----END PRIVATE KEY----- diff --git a/certs/nesica1.pem b/certs/nesica1.pem deleted file mode 100644 index 3acb5d1..0000000 --- a/certs/nesica1.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC8zCCAdsCFDZ+Tm8tk3VYtBpdHnKbXA8YPPzhMA0GCSqGSIb3DQEBCwUAMDUx -CzAJBgNVBAYTAkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMQ4wDAYDVQQDDAVu -ZXN5czAeFw0yMzA1MjUyMzU1NDNaFw0yNTA1MjQyMzU1NDNaMDcxCzAJBgNVBAYT -AkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMRAwDgYDVQQDDAduZXNpY2ExMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxxtWyHbbqZVnZ0HMJwGikcpj -2RHubzH+EauEr7WZ/nRCJZkU/VeV8HPpOYVHMizx2nGnBeAZZqi2H4p04DWenp/s -6N5b3uMbnVG1harNS8n5fEKcZGBAHKmJv9drOu2sIgrIi4MRgqcdq+bgDWoxd/ny -aK9OIib0mOA8emz6vmpea88r47rvEBJqxGrs8T9FBVSWWk5lr7Iy/OtgJQiddIAR -KfzU4N/zuFmM33aYlxNznAnw8TMQgNSLSUrukSY5+m+Zu1OpRZ55lgKX6DUVn4g+ -slyVQB7cwRUI1fC6M7wxF4nkxxXjZXnawCZ3Q0URYWFZIWoQgsx3viRIMrdETwID -AQABMA0GCSqGSIb3DQEBCwUAA4IBAQAQK6IhqNmQXazRTD7F0jC4KG3WZB0F7qSe -zxwUXxyl6eso6Wd68e9Dsj5blgWhmvmwYW1M5L6F3OtswvJAV86a488jU6J89G0m -tIQFESNg/ZraPcjP5wKYSozxlG7VUhktitausfmc07DOjN5WU+sMKinZ3tQG60X2 -Gfrz3v/6VWRtIwCOvAYv8pva4qj7+4VbFj2s5FjnFT8Izr7kPYVub0NsbdaNRtj5 -OBLdlD8v1jKKCEBCHSMpqsN4QyhKfouvDelANwjnUEGVcWPOb93UCr8mAxeHV11K -BTXTTXchXaP0hPUzANu8kVI5hqHuAD1z9dKDABzCDvwociJUZb6B ------END CERTIFICATE----- diff --git a/certs/nesys.crt b/certs/nesys.crt deleted file mode 100644 index ffa73a1..0000000 --- a/certs/nesys.crt +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDAzCCAesCFGjhFy1u+fFa7EMKu5PhgovcJ+tBMA0GCSqGSIb3DQEBCwUAMEcx -CzAJBgNVBAYTAkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMSAwHgYDVQQDDBdU -YWl0byBBcmNhZGUgTWFjaGluZSBDQTAeFw0yMzA1MjUyMzU1NDJaFw0yODA1MjMy -MzU1NDJaMDUxCzAJBgNVBAYTAkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMQ4w -DAYDVQQDDAVuZXN5czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJHo -pDobYNfJ9sbh8zEFc7sfQ7rELITgyuO08XAbuPpNl/vEvjPDnCLcsxKKEi30S1tJ -VkW1cQwhGgP6InMggOVsmU/4suLjjS0g/lpUOt2oQn0lrDLdCq/63hGfo187sAe8 -SE2G6I/EPQSrPbA4zZmwOVEJnW2qmOLmAnfWXKiqO8141v11K+5LPCdYP6W0pq/M -x3kA5dABDbvKjTvv8JMXB/GOPt0ZVqmPdi//bP2ig+qyxkPVimzkQhwR4ISecioR -9O1/EIz5v6p0lId0ZaOc35cbDljqlC/tO3CtDmpgYzGxmDzHjUyO69R5ccgOfVZl -LZT5zKlknYeogo3MRs0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAODx8JwUrd8/P -UjAtoDksUQV7YkZYig2boMwLW1E+5VOC1wySkwLd3os+ujgmi4+8u0Z+uyrMddrv -4Um+YGZluLW7HBfq4Thpwbo+5FqrFJ+uiZdzQrpav1lH+VMnS/T2VH91v241ZnNU -9mcKIuWLJQ5WaVctBk7EQTqPokfB4AqEkdltIeMWPqwoqC+O1TkP9VESMY7Lezap -VRzYGraKDfLPLO7rbl2vsRbMthzTWXRRzXwPBWj4ccqevUq5Q+rQRSme92bBf226 -KLfC3Xa7DdhPiVw1AFlAAwqLVZ4b07b/iS9RKKuk5ytHXTBITvRk4N7SlzTQBmiD -WpxMybgWsA== ------END CERTIFICATE----- diff --git a/certs/nesys.csr b/certs/nesys.csr index 6200227..94d1cd1 100644 --- a/certs/nesys.csr +++ b/certs/nesys.csr @@ -1,16 +1,19 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICejCCAWICAQAwNTELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM -AUExDjAMBgNVBAMMBW5lc3lzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAkeikOhtg18n2xuHzMQVzux9DusQshODK47TxcBu4+k2X+8S+M8OcItyzEooS -LfRLW0lWRbVxDCEaA/oicyCA5WyZT/iy4uONLSD+WlQ63ahCfSWsMt0Kr/reEZ+j -XzuwB7xITYboj8Q9BKs9sDjNmbA5UQmdbaqY4uYCd9ZcqKo7zXjW/XUr7ks8J1g/ -pbSmr8zHeQDl0AENu8qNO+/wkxcH8Y4+3RlWqY92L/9s/aKD6rLGQ9WKbORCHBHg -hJ5yKhH07X8QjPm/qnSUh3Rlo5zflxsOWOqUL+07cK0OamBjMbGYPMeNTI7r1Hlx -yA59VmUtlPnMqWSdh6iCjcxGzQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAHGY -t2CMcpUexG/bnEv46JCwbb/Jr3ZRfVP7YIE+EZA5QHLhRd7Ja8AwaEHHkEUoa8lt -4ULkmeouc4pHY73aRXmKr4EzoFxlgU1hWakS85EJxH3g++LdUZBc5MIVO4xY5ckB -yBvYIdNxGca61bd7jbJSliDYC/cJJzEQDbj+QWr8BZ7YBcO6amppnOZSYW7wQa/h -JSbgy8b21XzKY9acACGwjGnXux4IaQNPEhw3JZpsolby2z73kWXmTzbqC9s93Wnc -R35jx8HiM+LhRJquYNYBIMu+J38QhrADsMdO7AcQJvjPxpPCF1y7D+owWThfXjEL -Y3q6tqCbaTG1zUEZ844= ------END CERTIFICATE REQUEST----- +-----BEGIN CERTIFICATE----- +MIIDAzCCAesCFGjhFy1u+fFa7EMKu5PhgovcJ+tNMA0GCSqGSIb3DQEBCwUAMEcx +CzAJBgNVBAYTAkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMSAwHgYDVQQDDBdU +YWl0byBBcmNhZGUgTWFjaGluZSBDQTAeFw0yMzA1MjYwMjU5MThaFw0yODA1MjQw +MjU5MThaMDUxCzAJBgNVBAYTAkpQMQowCAYDVQQIDAFBMQowCAYDVQQHDAFBMQ4w +DAYDVQQDDAVuZXN5czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9X +dLz231Km8ubqSn4OXzozth8ZeYDmRsPfK5gHhbiu37/O2pPEGFzJLgIItelbLzEK +H8iesjA7WmuAdIIisq8+3VuwKh/CjoR4ZZ6FNUlOlDyLhvNnzHlZyAC8gwMB0qgf +hTJ6+ogw0qW0aMFbet96ptCn1t+OU3raC7+l8SfPcx28kR/XEhh3wgLQFPx5y6OK +1bORxuC5NiQrbzOY8RGemIaVmWEhmkdhSZRgeSrZV5rajuAIyQK17IXPsQyEGcZd +ZmynHBBmzfVwHbHtRPlh+su45N7852mo9vli/txP75dQ3ObOThIdJ/SXTeQaMzGK +mmmbUddL6nF4c/i5GyUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAjN2Gcg1TSnN+ +DX6CWUvRL8VXRdoZARQTEkPPxtGgwF8iAHgF18chp+j07bCnO1wOEhog2S8Z1G0+ +io3FEC6XmiziZDCxZccr/Gzfe5yurrSYHy1LqDEe9KBQU3pLyUxBnwObriyiZSlx +sPEYO62N7b0D2AsvmdFIGki4VLUVVknjDTBMbaMCy+jw7rfbmCks389CQ4/AHCcx +HfjzkHi/O+vGjPg3Y31azvZG4gZei11qKxPgpWhn4hsrVd9pBR7C4ayuMi+ZMBHp +/E9QWHfM+O0Mz1HsCrC4JBBC4qywYno+f9FWjf4CpQkah1ZOjD+CaB2br5oJ3IiC +OCsrKbkNPA== +-----END CERTIFICATE----- diff --git a/certs/nesys.key b/certs/nesys.key index 1e32bd3..39af633 100644 --- a/certs/nesys.key +++ b/certs/nesys.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCR6KQ6G2DXyfbG -4fMxBXO7H0O6xCyE4MrjtPFwG7j6TZf7xL4zw5wi3LMSihIt9EtbSVZFtXEMIRoD -+iJzIIDlbJlP+LLi440tIP5aVDrdqEJ9Jawy3Qqv+t4Rn6NfO7AHvEhNhuiPxD0E -qz2wOM2ZsDlRCZ1tqpji5gJ31lyoqjvNeNb9dSvuSzwnWD+ltKavzMd5AOXQAQ27 -yo077/CTFwfxjj7dGVapj3Yv/2z9ooPqssZD1Yps5EIcEeCEnnIqEfTtfxCM+b+q -dJSHdGWjnN+XGw5Y6pQv7TtwrQ5qYGMxsZg8x41MjuvUeXHIDn1WZS2U+cypZJ2H -qIKNzEbNAgMBAAECggEACnMwxeedkz7oAXz/y6hCDmoSEf+IV7j41v+n1hlqMWUa -yEGiRLdTCK0pVx/T5v4q4n4ZY3M4BkAdqqDA1GGE0cmqHk/n0fetrgiBpwsGz0bE -gk2PLHJn2Ew9mOIH06OE+zzZKdJKeDd8DkhMagFbelEkfcEUSR0xh3ilPxt3de3l -k7ZmO1CsOixQyGR9/9ij1NHhJ1R2D3tTSKXW+mfPtFCBNmIiaS553C+0cp2T+3Ge -C/p/UAL7OKOHIGXuBpik3d3zZnlMR0p0ROv80M8cWvhrTRrHgnpH7I20iuqxLEdd -PXsfDUtKGjYx64OKDa4OmlIiHFT/unJVWEf93dLtQQKBgQDLY9q/F4K5PQYn8vov -5vdABgRaOTj2M/twhi8IhXhaWGlMsRQd1OE+W60Ni6dnjKpHIA8yJIfSeDacDek0 -mMJDH3aTsHDmC2rqT0bGNBIBRqZ6A02GP2SvnFI4RFDBcCMZDGXGE1zR3/4VddGt -3Sv7+OPzpCLvPyaW5HSiRYPUQQKBgQC3pnj3xpdnXrviaUi6d0w0uEd7BdpEgUok -vonhm/xKsn4ypbn3Zn+tXlannnA7YXmGyMg9xTa3jcYb+eTavjbHGZ2WeWhH2BZr -CTe4KoKaWpouWothm3a8Zx7fak5OXrADyHnBiBEyGrmZbEB2MuZOyRY/p+Kg9a+F -zmveHFyfjQKBgBVbnQLoEyAkmlrjlwYkuN4OQ7K9w4+HEeZVEOdSLLtAAX6+MaCY -VDbaJagAfEnRaagiY7YeQ+0EFqf4hf6x8+Rcj3Ue2BwwIsAMJyB1I1bi9mRlqGRq -j8YpIjEqa1iE0Aq3VJCiQ+L+JI5YWvZo/U9uaXGSUODSvtilkOHhbuCBAoGAf+wT -gvPv7m8MjI8tu8Txbh+Wmtjeyq0MSj/2pxISUK24Pes2eGALO2XlEmjIYHRrRDmD -UZOXo4+7mS0d/khUu6baIEB9JN4d73zCNSRXSNEnaHZldB3oPR/PX2wbE3fdPyVb -ujTfVXlMItRGqo6V4fcr6jc1I00/cALzHAnBctkCgYEApgWozZ0ZaxRUBdlzgCWV -LEM/fOqj7LX3ZKQgimHZp1/5CsjfKhFdd2LthkpZN7+nFgKC+twK5xY4VbyNPhRV -duHsyO3Hf1mNFV5cj6UN4L3MLhSZWv3/+qSuP5ULSjqP22uazc6mGaxGFeDI/GBu -5FRl8amWN6/sHo6EDPBnjFo= +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCvV3S89t9SpvLm +6kp+Dl86M7YfGXmA5kbD3yuYB4W4rt+/ztqTxBhcyS4CCLXpWy8xCh/InrIwO1pr +gHSCIrKvPt1bsCofwo6EeGWehTVJTpQ8i4bzZ8x5WcgAvIMDAdKoH4UyevqIMNKl +tGjBW3rfeqbQp9bfjlN62gu/pfEnz3MdvJEf1xIYd8IC0BT8ecujitWzkcbguTYk +K28zmPERnpiGlZlhIZpHYUmUYHkq2Vea2o7gCMkCteyFz7EMhBnGXWZspxwQZs31 +cB2x7UT5YfrLuOTe/OdpqPb5Yv7cT++XUNzmzk4SHSf0l03kGjMxipppm1HXS+px +eHP4uRslAgMBAAECggEAHBBx6VrUJLz+7NG8KY/wUvb64+Bmb6ir0+bw6czubMBk +pKUdnAALbDJxEDdHsnl7RKybqLcpywl87+7n9vpJwj3cHTRFkb7Io9BHZ4dnn3uZ +w1ULvQK0mgmyNtf1WjJc/rbI0WsYlVrHJGmLSMN1F7bgY04x2KdFmkizD7ImNpo7 +0b6Z5xS7tYcGRzXi8Q1HZrI4rrBGV3h/2ojtvx2Dfk4p9XWg33v8zCCfQYL5LHMd +jWyVTsGJRFeXphR42pyYbhg0cYAnwHfVSctoOoM3CupjmtB/wPkpYXOxlqiD/1HM +SNCfQYk00Lu8R3sshPTdWRUp29Bv3are7OzGwH1i0QKBgQDs+0Dkdi1795GTa1Gj +4AZpcYHrwhOFbCjeJ3QMqe5we3F8hHkn/Fyq9dctwbwN4H1DzTMnfhMEk0lofWN9 +rUcBVotiSdlkBToJWK71YgvMiHCPpMW35dRJ2zMuESGyX5FaIfwENLN+WC93e3Pe +f3AUHyPGziF5vDCNo2nFR9tQvQKBgQC9adJoUsOL8fMiP8bsCtx8hGmAQhSqSFVA +Gw65jdIfKjP8Or3aE+GRUYd86pDtSZiXI8oQ5NyqdW5YrC3+NxGUZjBtZ0hZhMji +AWW/I5xdh/V+ZyuJxnulY0kDHh166Qk5nkLxgxnWvoozWpWEmSnNgq2gwmIRprMj +HZoIXKPeiQKBgQDl2ciWDp2NKJFVB/lWVfpCGWrnDQU8Gq0E1AV2Jvfyt3haSm7s +vpPu6aV8ZvUMDJnSwluESX8OqADCTSPLiN5eyN9GRNSKc5tX52FC9Yb2KbvrRujS +tiMSQ34/hzREuvbTEjVKqwcRW10mqWG4A6jki1N7BwFm/oWlS0NSqqBojQKBgQCu +TPcGcULpQRjP54iSJdyH6QF8uVJy8GUivMNsFQnLC/cSoKucRrdIFpJrbR84fIUi +cBi+Oxyk77M/fhJE4UAYI4Fk66o0VnDVKRwMLCT0HOzYCPCTtEaMBzVk3Q2b0V5f +2zcXL+FTL7vVTgJRJvDE4QAN81Jzk8c9BTx9fWJ+oQKBgCIRU4lw09EZ8kftVm+i ++JR1NFy/tQ0ynmPJ2WEbl3cp0e+aFyYyTiDhQ8oNYnWUuFD1zU6pnIANLdWcdmMI +SefJcCh/oX86pVs+7C3wmZ8wa2MtGs3MhOnLFmTS+9IUB9eHacKOfqLVsJ0tWvQe +QQuoM5Z09AYvIT9JFFl3LY7u -----END PRIVATE KEY----- diff --git a/certs/nesys.srl b/certs/nesys.srl index 5faf651..c5e1c04 100644 --- a/certs/nesys.srl +++ b/certs/nesys.srl @@ -1 +1 @@ -367E4E6F2D937558B41A5D1E729B5C0F183CFCE1 +367E4E6F2D937558B41A5D1E729B5C0F183CFCED diff --git a/certs/root.crt b/certs/root.crt deleted file mode 100644 index 4da3d65..0000000 --- a/certs/root.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDbzCCAlegAwIBAgIUL0VMXq50yymLhgiQwTkZwzC6wz8wDQYJKoZIhvcNAQEL -BQAwRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExIDAeBgNV -BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDUyNTIzNTU0MloXDTMz -MDUyMjIzNTU0MlowRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM -AUExIDAeBgNVBAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqmKXUDApDAznlYiVQgauatknDqc2MNKhWjKy -6iXmRrbgyAXKUfzYpBH+JARqQl8y9JweuSiEg/vBkOQ0feUl/WVK8m9V7e+ZTtCx -4Vg6FDQzUkX9WzC2HuYq0i38q8MX+u+b/hnM1Mf0PpEbWRq4OBWA2VRu+hikzjbz -CiPJQdVkPjRENG5gJctzWacTzssxiEvRtknwIwOHI+TVa6hhrKp9RysWRDnOy3PB -QCFPmMbgrDg0A+b1ZXCzPZAPLmjPteo2meAkBVaoMMYGvUEK3OsPtviWmYG6/iv7 -Zm9ARTEhlt42xHSOTHh1hLwEMBf5Y3tN1jrwTbWE+WEgHqrKjQIDAQABo1MwUTAd -BgNVHQ4EFgQUP88uu/B+mYmsPzPxK7Ss0a+TMlswHwYDVR0jBBgwFoAUP88uu/B+ -mYmsPzPxK7Ss0a+TMlswDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC -AQEARju1Es1unAfhoWEnLo8ZpGSrb07V+zRkV94M1QW9W3gbS94irxEaS0vPtOFb -jZImTddLLCZ7rWAFsUVG2pTT+vhjUs0IEJ9FcwTS7/bF/UOGuoGPc3sBGnf2ZVQD -9OujCSl8JP/SbwE2Lz2wZwDvKWKxfGj8DHkWGdua+JELZZipJ620t5srFCi/mDgV -s8eZrNtulsMMeSmKLOGOIztsOwr7Om8o3qNxBcCWzgDDrsAi8PlXUuZCkL8Taj3d -fFj1eyPpYNgdJfjjFNLlcXnZD2wJutgAUsrOKUiXe40Itpvn7OFF3hAZba9+F25e -F5p1gdD3pYxG65WMhNEgE4hgLw== ------END CERTIFICATE----- diff --git a/certs/root.csr b/certs/root.csr new file mode 100644 index 0000000..1f941c8 --- /dev/null +++ b/certs/root.csr @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDbzCCAlegAwIBAgIUCoJ2ETHQx1FkAoSz3HujwKxhXe8wDQYJKoZIhvcNAQEL +BQAwRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcMAUExIDAeBgNV +BAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMB4XDTIzMDUyNjAyNTkxN1oXDTMz +MDUyMzAyNTkxN1owRzELMAkGA1UEBhMCSlAxCjAIBgNVBAgMAUExCjAIBgNVBAcM +AUExIDAeBgNVBAMMF1RhaXRvIEFyY2FkZSBNYWNoaW5lIENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvWI8nFb/7hS4dMQcxG0jTnI12WK4wtuuECXQ +Firm8fTU7ljRfcak2qZ3MQVnDccJNMhIpXMVPanfYMxheafbumenFr5iEH65cIX6 +fPOXHk7p3PppETrniCdz+a9SowN4V8f+XQOlLXfSTmus0+9/sCTiGjv8oxNoEP2L +vVk1rLI/+hiqYnX0l3MwSd+0Is+VMk3JbYQ5IfNfwvuJK77FtU/lVuMcBkOCEmwk +0Q31h53XYhzSfH/w8QBaBpU7cwYvk3IRH5VfPN1XziKI0AOHZ8r/ZcxQIbTNBycr +O3nFM46YeE0+maDV7NvfRor0qBO8k5vGa1OauPCUZJTB5aEIOQIDAQABo1MwUTAd +BgNVHQ4EFgQUxWVKjuP7c1YZokbWNZqJuCtOX0cwHwYDVR0jBBgwFoAUxWVKjuP7 +c1YZokbWNZqJuCtOX0cwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC +AQEAaMOL0w7cSzfRHNmsUdkbmbqaOrdD/G5wJyYiPAUFlmhVOjWWvFK60TBRIetQ +9RgWhpmYFJw3XsE8cDSwpg67eYxu/OkhYi2ZbKYVbfYgRrcYI7kmEcF4AvMAedkK +9kjepSTGEOAmlDCIvtfWQMoaxLomaRufsh0bShLtgZlBrc4tD47dPKl9/oZqXcod +9k3+hYheZ2/hBhAsFhtXEo339ngbUuEhuAaEOoghMK/HlDWs3ubE2fAStcc8emI9 +0tnQhOv80lxLk+9ZuMV6X+XKKmSOdnZ4NHXYEd5yXqrSwgjd4dFUo3IX/44hAL68 +ZysJ40gw+hM8DkcpaxSjd5682A== +-----END CERTIFICATE----- diff --git a/certs/root.key b/certs/root.key index 3cc7066..ef31bea 100644 --- a/certs/root.key +++ b/certs/root.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqYpdQMCkMDOeV -iJVCBq5q2ScOpzYw0qFaMrLqJeZGtuDIBcpR/NikEf4kBGpCXzL0nB65KISD+8GQ -5DR95SX9ZUryb1Xt75lO0LHhWDoUNDNSRf1bMLYe5irSLfyrwxf675v+GczUx/Q+ -kRtZGrg4FYDZVG76GKTONvMKI8lB1WQ+NEQ0bmAly3NZpxPOyzGIS9G2SfAjA4cj -5NVrqGGsqn1HKxZEOc7Lc8FAIU+YxuCsODQD5vVlcLM9kA8uaM+16jaZ4CQFVqgw -xga9QQrc6w+2+JaZgbr+K/tmb0BFMSGW3jbEdI5MeHWEvAQwF/lje03WOvBNtYT5 -YSAeqsqNAgMBAAECggEABkieCRAWbdiw/SSjhCMACwLVeN0fHfRUQCHg05e27LjN -9+dJkGky6fQbuDzTpWOvTgwCHXTnOpqnh0r41tBc+XTwBQDCcMS2fCYtFTqX4731 -sZOET59iuNqz50eL/lKmDDQkTHeSBG8X+YTukJ3wMtAaNFZzxE3x3NGnRQjph6Yb -rfLhaqhRSnGDqmqN63rlA6eSyJYq9Kqp2iz+obQ0VuizcCepw5WpK5p12hkk9P0U -4523JPFJSAbS7ZiF1qJlKB3T959DOUiSoMpGx2Hddp1pxPXqXVnghCLYV9e9Zdi6 -dqNCCfFRQJnLlMwkhRv8jKlMF64c7P86vujnXy07+QKBgQDo7jkR0dloexg2airR -ssq1vWOmsdg2GVlAQYKb3B1p0FL775aKoHpkEkc2hlCXNPiAkR0cKAd1mkejppOU -zWO5ElAArBIBJOrtPDlkL3Xkw0MUDVGI0davbseMqSd6KQdYnu6Cfqujq98rMbGl -4YHYE/pCuxlSZFiCJJzUPopyZQKBgQC7QpOAOHx5VMn9BrjIF8DGLI35a39kGjJu -6toqkskRqTtXf5Myw3kXeZ/3VXlEnK4sV/zEgWDUHoyv/E13EB74eOMUPy3ohW0v -eZfe9VW+ac6qjDbNzE2PP1JrAygcSW4Yn3XTfJuOsX+UmxrhFvvZHzivRuV0VmPd -YSKusxrhCQKBgCD8g4Z7gl9id0ZVeKTjvgNIw9D6hJT8t//6hwWNgXjXsLjO8DHH -ki2TzRPyp30SWlLSuh2fqZbE93o8f8/l2kZ+Smgd9hrFYKOiELqYYgi4gkpXrIFE -vjNv68CGv/lzz/+D2mEOkT4He/5A9lh4fAveoGVM28QoQ8SCbNc92BtlAoGAKlEf -OAiLyHdqte1A8Ka9f4suAkFSpnJtFzenWZuWKJGPwXQo9X3K7Y0koyYDo4esrISt -sFJ0aTsGG/buIovYE9ptpnOokjUkuWfG9DGI0ODkPRI2iEc097wdieVKuSm24YWX -gNVV6ecep5xtdJRXEXfGvYVN8P5czvhWeBgtaNECgYEAs6zPKzQ3+4+NCx9xFKmT -yJpHUVOnFoZQucYeNRT4lI+etbsL55lxrsgWzGygCKugf1g2teCMI/z46eRQXDTf -XBmdYqmPIt0h+9g/KdRUKykekhJOsv9IvwAJm/lI2pD8HaoEyb+XzfIGxHoVp7I2 -rUMptemlzeWwlW+HpiBeQj4= +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9YjycVv/uFLh0 +xBzEbSNOcjXZYrjC264QJdAWKubx9NTuWNF9xqTapncxBWcNxwk0yEilcxU9qd9g +zGF5p9u6Z6cWvmIQfrlwhfp885ceTunc+mkROueIJ3P5r1KjA3hXx/5dA6Utd9JO +a6zT73+wJOIaO/yjE2gQ/Yu9WTWssj/6GKpidfSXczBJ37Qiz5UyTclthDkh81/C ++4krvsW1T+VW4xwGQ4ISbCTRDfWHnddiHNJ8f/DxAFoGlTtzBi+TchEflV883VfO +IojQA4dnyv9lzFAhtM0HJys7ecUzjph4TT6ZoNXs299GivSoE7yTm8ZrU5q48JRk +lMHloQg5AgMBAAECggEABuL2O4Sl3pNSEEvr1GA4GROJ3f9rIsnQeu2XEyFI/9ok +bozcBE/3gWxtd+K/iDaZQPo5+wsz5efCE8/myQDXun/nqWnvoLQs+9ihXs8QSxW5 +RxPzg2ECF5dArj8H+R3Ij9+ZwineZSh+5SNg9911BhOXRbcx9P+hCIIhxVdDvoV2 +JFi+82e177pFooZYHSh0g4LuOoFKQ/Jk4y4V65D9YCNv+EylyDuFRHsqbeEezlwb +nJJYnwsy48rFMOGF6IJOwrwl/MfoGL13d7zR0eQv8GXe0chMv4rwXx4If+OCcw0k +nIZPneulm4W4Cg8HdNEguMHgduC6CWmDgBsRwe0MEQKBgQD+RZnXnmTpxfCLiBvI +7CLi4IxL4+x8FrID9Ix3srUrON0l7D7OA4UyZHRzEZY0321jDY5TL1LbxRBq0Xtc +XjHrQtVhSEBdH7pN1ZpkVMGXCRoiENWL8SF9Wan2MFRsV1DcTEGP9MBkS6J3tzBl +NF/hjmJOm/arA2g8ClHL3OvD6QKBgQC+q703idAmSOagwBo+i8JBqgW7NGDUh86w +pfqcsFRIChc9SikwvNioD5FN0FPk3D6VXsC5IhelTllKU0buQ8NHVODgPgnyZqkQ +2cqrut0yAk01FEh4jgMv3+8Wu2kzlA6c7z1c852Vh+QsCCR1Vo4o4wbgE3Ky0BLm +6mMzzVn/0QKBgQDjLdhn91L+MyXZ5L++YoxA3JM88uVFcRmXwxUFlRudBG9CBLOQ +aUDGZ05LyPjFQKKBD4mL9Qo45PboGUX4nwhGxC3VfzJSgZh5FlGdNsTIZw98REIn +iEd9sXDTTxb+vXy3d0JUlj6W3aTJBVkt8v9/jTF0PpDC9oZYrneqhzX2kQKBgCj0 +gK82ReSDUi6DNN/sayxpldORO59LEIV3EW6onWHf8P/0NwbF+Y+X0HEzZ2HIQRUa +hjD99rBGNP23B4xUN9TRkX/5M2/Cx1vcPCFJAQwl3GmjUrG6Z0rYQeXTGZS/n6fr +53VYyqd8yfD/Sr19ewmjQi3NX5yy/uxkuiw9VrCRAoGAXLc+hN0vQnWg5Vu6Cz1P +2WFnZKvQuPkh9b0mkWskcyh+Tu8LAJEOu9br6G0VLsqAQKcogsAfas71dm+hIwz3 +tALorqQf6xLvt06IUN2y8xCn2Tb4BxMhKV8vOOARwHthbG7j4bXQwko8exbvDZX7 +xlQg6htpoIbB/l0x5AQ/M+k= -----END PRIVATE KEY----- diff --git a/certs/root.srl b/certs/root.srl index 4bb5893..595a2c0 100644 --- a/certs/root.srl +++ b/certs/root.srl @@ -1 +1 @@ -68E1172D6EF9F15AEC430ABB93E1828BDC27EB41 +68E1172D6EF9F15AEC430ABB93E1828BDC27EB4D diff --git a/src/main.rs b/src/main.rs index b1a7d32..1cec7c3 100755 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,6 @@ +#![allow(unused_variables)] +#![allow(non_snake_case)] +#![allow(dead_code)] use actix_web::{get, http::header::ContentType, web, App, HttpRequest, HttpResponse, HttpServer}; use rustls::{Certificate, PrivateKey, ServerConfig}; use rustls_pemfile::{certs, pkcs8_private_keys}; @@ -80,8 +83,8 @@ fn load_rustls_config() -> rustls::ServerConfig { let config = ServerConfig::builder().with_safe_defaults().with_no_client_auth(); // load TLS key/cert files - let cert_file = &mut BufReader::new(File::open("./certs/nesica1.pem").unwrap()); - let key_file = &mut BufReader::new(File::open("./certs/nesica1.key").unwrap()); + let cert_file = &mut BufReader::new(File::open("./certs/cert.pem").unwrap()); + let key_file = &mut BufReader::new(File::open("./certs/key.pem").unwrap()); // convert files to key/cert objects let cert_chain = certs(cert_file).unwrap().into_iter().map(Certificate).collect(); @@ -107,9 +110,9 @@ async fn main() -> std::io::Result<()> { .route("/server/certify.php", web::get().to(certify)) .route("{path:.*}", web::get().to(index)) }) - //.bind("127.0.0.1:8000")? - .bind_rustls("0.0.0.0:33333", config)? + .bind("127.0.0.1:80")? + .bind("127.0.0.1:5107")? + .bind_rustls("0.0.0.0:443", config)? .run() .await } -