Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/rpstir2
Binary file not shown.
14 changes: 8 additions & 6 deletions build/tal/apnic-as0.tal
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
https://rpki-as0-web.apnic.net/repository/APNIC-AS0-AP/apnic-rpki-root-as0-origin.cer
rsync://rpki-as0.apnic.net/repository/APNIC-AS0-AP/apnic-rpki-root-as0-origin.cer

MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7xn+C9dYQDHGaEIqFteuEnW3r9KJOajc
6Jl2ZdgB7qps+dvij1ZAhK/FTKBNGgzM7zLLg2dcDiZRBYd7bgFBC+nZouOCsm/o6JRSZqk84bNq
NcxuWuyt0iIBc9n0rZIo4YoJOh1Xjs1lq6B6MikR2iTC1aApFC/haZAS1/i1awNcvAb9xfVdp0/M
pI0Ip8rmJix33NCWtaORkn21JgTrE3H0Ov8oAxYfbHLZQ8sI8gI7yrpipCDok8cCVi7+F579ROXv
SpZUFF5a/rtWABoNfXT5nFYMAZJoGoAazBIFBiCUaxUJsaTVChDdAw10qFQu7ZPKyTdoHh+LD0r8
Sro7qwIDAQAB
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7xn+C9dYQDHGaEIqFteu
EnW3r9KJOajc6Jl2ZdgB7qps+dvij1ZAhK/FTKBNGgzM7zLLg2dcDiZRBYd7bgFB
C+nZouOCsm/o6JRSZqk84bNqNcxuWuyt0iIBc9n0rZIo4YoJOh1Xjs1lq6B6MikR
2iTC1aApFC/haZAS1/i1awNcvAb9xfVdp0/MpI0Ip8rmJix33NCWtaORkn21JgTr
E3H0Ov8oAxYfbHLZQ8sI8gI7yrpipCDok8cCVi7+F579ROXvSpZUFF5a/rtWABoN
fXT5nFYMAZJoGoAazBIFBiCUaxUJsaTVChDdAw10qFQu7ZPKyTdoHh+LD0r8Sro7
qwIDAQAB
1 change: 1 addition & 0 deletions build/tal/apnic.tal
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
https://rpki.apnic.net/repository/apnic-rpki-root-iana-origin.cer
rsync://rpki.apnic.net/repository/apnic-rpki-root-iana-origin.cer

MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9RWSL61YAAYumEiU8z8
Expand Down
9 changes: 9 additions & 0 deletions build/tal/lacnic-as0.tal
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
https://rrdp.lacnic.net/ta/rta-lacnic-rpki-as0.cer
rsync://repository.lacnic.net/rpkias0/lacnic/rta-lacnic-rpki-as0.cer

MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhW5FgZ9Foda5ZpboK99IzhnBG4Gu9t0M
bzaqUI7rEH70RKbxpYtBguktrwVX3CaK7BiDtxOEtQv6iikt2DyfLZ14tpwoh/1NBqPilb+PfvNC
N75LU9WYv5Fy651bC+N9kO7tAZeWY1NhZCYi3FjFjBRvv7IbUuWx5Us+xoV0g1jVVI5PI69Cbp/j
1a3CutCe92yJ5z9VTJQYXPw32ti0gAAERCepr21y4sO4rJiJtdDGk2+ezFzSgvgitX+/aqaoTpsD
HCcSu0ScdsuY+XIQuq0f/Pcg/ClwSmRX2M+7nsbiOHv0GP4VubEW14u9lvu+XdpaPcZVBRldaP9h
5I1f2QIDAQAB
15 changes: 8 additions & 7 deletions build/tal/lacnic.tal
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
https://rrdp.lacnic.net/ta/rta-lacnic-rpki.cer
rsync://repository.lacnic.net/rpki/lacnic/rta-lacnic-rpki.cer
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqZEzhYK0+PtDOPfub/KR
c3MeWx3neXx4/wbnJWGbNAtbYqXg3uU5J4HFzPgk/VIppgSKAhlO0H60DRP48by9
gr5/yDHu2KXhOmnMg46sYsUIpfgtBS9+VtrqWziJfb+pkGtuOWeTnj6zBmBNZKK+
5AlMCW1WPhrylIcB+XSZx8tk9GS/3SMQ+YfMVwwAyYjsex14Uzto4GjONALE5oh1
M3+glRQduD6vzSwOD+WahMbc9vCOTED+2McLHRKgNaQf0YJ9a1jG9oJIvDkKXEqd
fqDRktwyoD74cV57bW3tBAexB7GglITbInyQAsmdngtfg2LUMrcROHHP86QPZINj
DQIDAQAB

MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqZEzhYK0+PtDOPfub/KRc3MeWx3ne
Xx4/wbnJWGbNAtbYqXg3uU5J4HFzPgk/VIppgSKAhlO0H60DRP48by9gr5/yDHu2KXhOmnMg4
6sYsUIpfgtBS9+VtrqWziJfb+pkGtuOWeTnj6zBmBNZKK+5AlMCW1WPhrylIcB+XSZx8tk9GS
/3SMQ+YfMVwwAyYjsex14Uzto4GjONALE5oh1M3+glRQduD6vzSwOD+WahMbc9vCOTED+2McL
HRKgNaQf0YJ9a1jG9oJIvDkKXEqdfqDRktwyoD74cV57bW3tBAexB7GglITbInyQAsmdngtfg
2LUMrcROHHP86QPZINjDQIDAQAB
121 changes: 101 additions & 20 deletions conf/cert/server.crt
Original file line number Diff line number Diff line change
@@ -1,22 +1,103 @@
-----BEGIN CERTIFICATE-----
MIIDmTCCAoGgAwIBAgIJAN3o3p4MMiTXMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQHDAlTb21lLUNpdHkx
FTATBgNVBAoMDFNvbWUgQ29tcGFueTEUMBIGA1UEAwwLZXhhbXBsZS5jb20wHhcN
MjIwNTMwMDIyMzU0WhcNMzIwNTI3MDIyMzU0WjBjMQswCQYDVQQGEwJBVTETMBEG
A1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU29tZS1DaXR5MRUwEwYDVQQKDAxT
b21lIENvbXBhbnkxFDASBgNVBAMMC2V4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEAy1OTMG50iV9ODt2rBwvpbNMTdj5oYmHrgrsrCXLC
KP2mGOoHQohfVcW3ss+EBrNcOXqZHnu0SQnJAY6/zyGXQsloBeoAlk3UXXeNEyoe
mKprHN1jQKPrfJife54tzI9gkUN4IE9E09P7Ng2Twl2iLOwcF5K1SPBTw3HVqfun
fqhnAZE1mD3T5Yi4JXVnnOV5nv+apvWFyRb1OdyBpcMN2B5v+AsdVTSEjKzbTUbi
I+FUTyJCy+rJ2v15JHIYrJ+jA5YY1PId1qpcoAXcGtwB3bKjjC5m/Um3eO7KPVqv
iBxqFHWNRbM9HZQt17lm8LdkR76m09KowfkFyJsh+EnnewIDAQABo1AwTjAdBgNV
HQ4EFgQUEhEEY0TGM1TgZoHElgLMjVyQfbEwHwYDVR0jBBgwFoAUEhEEY0TGM1Tg
ZoHElgLMjVyQfbEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEALkf5
iGm4PQuzwG4fKfQkekuVGLG1MRpmcVTNjUbAcc6roaiIHDwMPazH/x/UQcpuhPEo
5DrZNW+KO3D0l8Ei4093rMe97clZei3gahpCNhxMoABT5oeleV8q7GgVIYMGLtSz
+kZ/iX866C4iKE4FRaoMq5HF8gi+U2YpqxzqBW2NjVAIpjQ1IcyRQLg4LxG4DK6k
rVGIVB5LFzh+6X2bBUadNrMAErRYyB8cj15waglUz0SVNQ9DW93AFWoSkblk9VF4
7DDOri/oESUdFYlotLcIJtlKVGDXLEj7q1ld9HBBeOU1FJI63HNAb8mgpyvvC1dr
p1bfPtuwEjMAGkPkAw==
MIIHnDCCBYSgAwIBAgIQC/J9cTgFZKEZYGCJHrcCODANBgkqhkiG9w0BAQsFADBb
MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xMzAxBgNVBAMT
Kkdlb1RydXN0IEcyIFRMUyBDTiBSU0E0MDk2IFNIQTI1NiAyMDIyIENBMTAeFw0y
NTA1MDgwMDAwMDBaFw0yNjA1MDgyMzU5NTlaMHwxCzAJBgNVBAYTAkNOMRIwEAYD
VQQIDAnljJfkuqzluIIxRTBDBgNVBAoMPOS6kuiBlOe9keWfn+WQjeezu+e7n+WM
l+S6rOW4guW3peeoi+eglOeptuS4reW/g+aciemZkOWFrOWPuDESMBAGA1UEAwwJ
Ki56ZG5zLmNuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp2rGYioY
Q/F6C/QROGK31nKorFf9381sOdRKTpwDWh0bPEsdMz0YIK0zgS1/Lnsk+5MzBFvs
AJM6xnBVIOuFvBoZJE+cxQJhaO0ENmHiwUNrL5opWeZxDy73TCUg3h0vBbTm7IEf
D0zcU2KvhrPdcffDfwrxPcV/bABjyQgdxm1ZuOxNQI74nanBx2W9gK4okryhzNEM
MIL/Fwk/gCzE79LVJlBi2smNhQo5jmt3NJ3JDMA4VSto55IvFKf+bsBwOShLhKD5
igSk8v1VK15Hq16TlXwAKf53hXgf8Yk4tIX37rrLR6U9KP1twF11QWhGZSZymCR5
U4PBhMamDJH7YwIDAQABo4IDOTCCAzUwHwYDVR0jBBgwFoAUQU6OaZ30biXseBQc
ftfNHZnP+WswHQYDVR0OBBYEFMxkv/poYoxpfaKK3v/DN2SzHPG3MB0GA1UdEQQW
MBSCCSouemRucy5jboIHemRucy5jbjA+BgNVHSAENzA1MDMGBmeBDAECAjApMCcG
CCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwDgYDVR0PAQH/
BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHR8ESDBG
MESgQqBAhj5odHRwOi8vY3JsLmRpZ2ljZXJ0LmNuL0dlb1RydXN0RzJUTFNDTlJT
QTQwOTZTSEEyNTYyMDIyQ0ExLmNybDCBgwYIKwYBBQUHAQEEdzB1MCMGCCsGAQUF
BzABhhdodHRwOi8vb2NzcC5kaWdpY2VydC5jbjBOBggrBgEFBQcwAoZCaHR0cDov
L2NhY2VydHMuZGlnaWNlcnQuY24vR2VvVHJ1c3RHMlRMU0NOUlNBNDA5NlNIQTI1
NjIwMjJDQTEuY3J0MAwGA1UdEwEB/wQCMAAwggF+BgorBgEEAdZ5AgQCBIIBbgSC
AWoBaAB2AA5XlLzzrqk+MxssmQez95Dfm8I9cTIl3SGpJaxhxU4hAAABlq5i7SYA
AAQDAEcwRQIhAKKRMmGuCBUAGlfz55jQQRcpwg8DJMr52s2GFpGZwj5LAiAwfQ7G
LrrJ3KAt2mFLcrPOBgOk1URMIRarpMRTaPudGgB2AMs49xWJfIShRF9bwd37yW7y
mlnNRwppBYWwyxTDFFjnAAABlq5i7TUAAAQDAEcwRQIgMLAwE4+u+Yen+Ikdkmyn
56v8nHx1/i2SX2lK0FSECo0CIQCFxL5fAhbK91uo4DwA0mUGg6hdyAj6f3N/p+Rm
hPMFtQB2AJaXZL9VWJet90OHaDcIQnfp8DrV9qTzNm5GpD8PyqnGAAABlq5i7WAA
AAQDAEcwRQIhAPBVtOZ9+VylQy/T9kLsU0HSRzT0fduXtnK/PpCw1yupAiAZZ3xG
5PtYd1ZrOc6ch3CJYgl6RGEHa5+3zqAD7+XV2TANBgkqhkiG9w0BAQsFAAOCAgEA
DCOcr9Xn1MZ2EktAVLliqMwqQyIplokABlxSroenmP393JK5oYDh4fw3I+RvZcdX
aZv/jbUXo32d9tbW7JYiPWaxvYymvSsek5nYEKKEAzqVrzw6DlhA3vFmqyNvJ6/O
5NVaFtbnT+AAqGO5jesTmQeUvpxGE2k3Wip9TB6SzFT/WUTIdTJla2aHEflQnF2y
t4z7VkbKO8CkY/jug8N1V96x8BedM41lgAIP5tyw/1RodmB1TJFX+hZ0AgftFJfI
bK6BWFNiB2gMHQhMMu6nxLxs3TxjpruNRV7GoEbXj5RkEOvCHZeZ6b+ibjQ2wwvs
awcZxxeGQGofAR17YUmS9HK8LkK87daJX0DQZaffaaD0/tWuR9qBo8Dc0t/vFDek
0o1CAbrzXgF0jlKDmIpjA0rhzUwfuHVblqxzCxeFufCSrhtGegbI1oszJbhOaAKL
dZ/fE+juPAZGCOj++yA7Q9uJdsuMNYxwqMKECJuwEhPFFGZnUTG5kgZ/GhfdFIuM
pnLwO0zzC8qVyubVQwhVydGllxNAco/pcpFsueKMsi42ja7ruzu0teA2vVor/jOU
TF4sx0cE89cVhBMj/rFUPf6Zflqdlo+6lcFI0E6IDaJ9iQw3lxPWi24cEfWJsY9Y
rbt4pJzgFu4LQFYmwCJBh2R5f+J2JUhO/TqqBb46nx8=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIFxjCCBK6gAwIBAgIQDwa7CTBhSCZ/yhtxwduAfTANBgkqhkiG9w0BAQsFADBh
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
MjAeFw0yMjEyMTUwMDAwMDBaFw0zMjEyMTQyMzU5NTlaMFsxCzAJBgNVBAYTAlVT
MRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEzMDEGA1UEAxMqR2VvVHJ1c3QgRzIg
VExTIENOIFJTQTQwOTYgU0hBMjU2IDIwMjIgQ0ExMIICIjANBgkqhkiG9w0BAQEF
AAOCAg8AMIICCgKCAgEAn1dxOo4OzYa4O1EJd0nhFI5QB/kXAJTHRI6C1J2Gz86B
Ge9+DD8R4vexG7/QnUvV+5887o+G4enlkDwJV1Pehq4i0n+X6VKIPg5cThCx6/o0
3bUkLWld7slhi3Hli/MaosZZuytdU1uCzQlGpaLB2TiTZbDImiVaykdfwl8V6AXP
0Ab4wIcvPggl4qlwyPsBY6NODbP884BmL1ntdXfzecGst30FnAtm4w+PTo0I1T3F
ITYXaNuIJnKonD1xXaN4Ar/rvcpKpntxVyZQ2T1Lb7vlfYISqNF+1ugpTzKnI1z7
xV7tSqXd2vs6Csy6yFN+QLWwMnGWuQkvrO1m+F7V85S9ECpbqn9qNtKl8gIQ7JeZ
BmBdLroW+4j1PDzBWmSWKB+gvRubVSTuoDR3VCtlI4G/Uh+ObF4UStbhKjr1SNCW
JcrB1oF+wWBl8Bvozm4xflyyGDY47KCP/Fn9X5GHDNLQA9R0zqDKRumipp1UXswF
uzH0I+gOuqSdZSsYID9XSVq6adcJ3rIMAcTuODcrPrJssOFKGFUbmY/VxbxMgYHI
/07Zfdxoa+q0osWpofbMhLPZz9UuJFBCLsjgSckkSU02/4itmLm9e3lt6E/4q9Mc
MCaS8+qrLWKG9wQtviC8zGynEXpxjEQE8WyrfeYKyXwZFCPB4rpTw1joJmGFeLUC
AwEAAaOCAX4wggF6MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEFOjmmd
9G4l7HgUHH7XzR2Zz/lrMB8GA1UdIwQYMBaAFE4iVCAYlebjbuYP+vq5Eu0GF485
MA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
dAYIKwYBBQUHAQEEaDBmMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5kaWdpY2Vy
dC5jbjA/BggrBgEFBQcwAoYzaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY24vRGln
aUNlcnRHbG9iYWxSb290RzIuY3J0MEAGA1UdHwQ5MDcwNaAzoDGGL2h0dHA6Ly9j
cmwuZGlnaWNlcnQuY24vRGlnaUNlcnRHbG9iYWxSb290RzIuY3JsMD0GA1UdIAQ2
MDQwCwYJYIZIAYb9bAIBMAcGBWeBDAEBMAgGBmeBDAECATAIBgZngQwBAgIwCAYG
Z4EMAQIDMA0GCSqGSIb3DQEBCwUAA4IBAQAkpDVI+nCKnAEEpDfldytHXUYOr2ys
aGeboE3d1KAN4Gt+eioRvgNdmDKbVFCYY0C6ErIXIvSGXafsprU2dclka/kmH+9U
4q3v5Acx6KwcnEuYLN0QOtrlQ9s3Z4IbIzdYUv8IauXC27a3x99x2WMVxNu1KGJy
0r1Z+Xya1adf9/e1LFj1CGdq9HfQ/HFWP2khzxQZ4u62sOHuZdPgtNidFOhQLC+2
5cNsPgqsaCrGLbSjzni7VN7NhAbTsLhA1oz41vHHB+q4ZzNlC01elmPBOtupe2HM
/lqMA/J/nTxc718THdxpszFllAET1/lFEolnqihpUFPaPjRwU7yZIseS
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEfjCCA2agAwIBAgIQD+Ayq4RNAzEGxQyOE8iwaDANBgkqhkiG9w0BAQsFADBh
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
QTAeFw0yNDAxMTgwMDAwMDBaFw0zMTExMDkyMzU5NTlaMGExCzAJBgNVBAYTAlVT
MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo4IBMDCC
ASwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUTiJUIBiV5uNu5g/6+rkS7QYX
jzkwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQD
AgGGMHQGCCsGAQUFBwEBBGgwZjAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZGln
aWNlcnQuY24wPwYIKwYBBQUHMAKGM2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNu
L0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDBABgNVHR8EOTA3MDWgM6Axhi9odHRw
Oi8vY3JsLmRpZ2ljZXJ0LmNuL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDARBgNV
HSAECjAIMAYGBFUdIAAwDQYJKoZIhvcNAQELBQADggEBAHRBl3jN7+XHBUK0dZnu
hMdoNwD1nCROU3BTIh1TNzRI0bQ0m5+C/dCRzzlqoSAFHUlOi+OiDltWkXTzmQn6
Z8bH5PFBy5sYpc/8cNPoSzhyqcpvvEZvv/Ivc0Up+dzma7vBDJC9WrMRUUlSFSQp
kdXSmphDNkXJsgARmxzc18IN6LYMRiOWlY7RE2F900pPW60BvJHHNCX0bbSRj/Ql
bmVq8wuftBD++D+RS8K++ujpMjFBROyWfBX+woQDGsMazkmgulQdnZrdj476elOL
axRvrSgEorju1kJM7M65z2RUZrfzQYW/1rs8mRUXin6iEtad/Rv1ZI1WGYmWPyBm
pbo=
-----END CERTIFICATE-----
50 changes: 25 additions & 25 deletions conf/cert/server.key
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
6 changes: 3 additions & 3 deletions conf/project.conf
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ maxidleconns=50
maxopenconns=50

[sync]
talPath=${rpstir2-rp::dataDir}/tal
talPath=/root/rpki/data/tal
supportTestCer=true
# if limitOfRepoNum==0 , means no limit;
limitOfRepoNum=1000000

[rsync]
destPath=${rpstir2-rp::dataDir}/rsyncrepo
destPath=/root/rpki/data/rsyncrepo
rsyncConcurrentCount=20
# Millisecond
rsyncDefaultWaitMs=80
Expand All @@ -60,7 +60,7 @@ rsyncDelayRandMs=40
failRsyncUrlsTryCount=3

[rrdp]
destPath=${rpstir2-rp::dataDir}/rrdprepo
destPath=/root/rpki/data/rrdprepo
rrdpConcurrent=10

[parse]
Expand Down
33 changes: 18 additions & 15 deletions src/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ replace (
rpstir2-chainvalidate => ./rpstir2-chainvalidate
rpstir2-clear => ./rpstir2-clear
rpstir2-model => ./rpstir2-model
rpstir2-parsevalidate => ./rpstir2-parsevalidate
rpstir2-parsevalidate-centralized => ./rpstir2-parsevalidate-centralized
rpstir2-parsevalidate-core => ./rpstir2-parsevalidate-core
rpstir2-parsevalidate-db => ./rpstir2-parsevalidate-db
rpstir2-parsevalidate-openssl => ./rpstir2-parsevalidate-openssl
rpstir2-parsevalidate-packet => ./rpstir2-parsevalidate-packet
rpstir2-rtrclient => ./rpstir2-rtrclient
Expand All @@ -22,7 +24,7 @@ replace (
require (
rpstir2-chainvalidate v0.0.0-00010101000000-000000000000
rpstir2-clear v0.0.0-00010101000000-000000000000
rpstir2-parsevalidate v0.0.0-00010101000000-000000000000
rpstir2-parsevalidate-centralized v0.0.0-00010101000000-000000000000
rpstir2-rtrclient v0.0.0-00010101000000-000000000000
rpstir2-rtrproducer v0.0.0-00010101000000-000000000000
rpstir2-rtrserver v0.0.0-00010101000000-000000000000
Expand All @@ -32,18 +34,20 @@ require (
)

require (
github.com/chenzhuoyu/iasm v0.9.0 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/nxadm/tail v1.4.8 // indirect
rpstir2-model v1.0.1-0.20230602021126-da8e9d252004 // indirect
rpstir2-parsevalidate-core v0.0.0-00010101000000-000000000000 // indirect
rpstir2-parsevalidate-db v0.0.0-00010101000000-000000000000 // indirect
rpstir2-parsevalidate-openssl v0.0.0-00010101000000-000000000000 // indirect
rpstir2-parsevalidate-packet v0.0.0-00010101000000-000000000000 // indirect
rpstir2-sync-core v0.0.0-00010101000000-000000000000 // indirect
)

require (
github.com/bytedance/sonic v1.9.1 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/cpusoft/goutil v1.0.33-0.20230703104450-9e717a93c37c
github.com/bytedance/sonic v1.10.0-rc2 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/cpusoft/goutil v1.0.33-0.20230802074252-9a1922c4a147
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.9.1
Expand All @@ -63,22 +67,21 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/parnurzeal/gorequest v0.2.17-0.20200918112808-3a0cb377f571 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02 // indirect
github.com/syndtr/goleveldb v1.0.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/arch v0.4.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sync v0.3.0
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
moul.io/http2curl v1.0.0 // indirect
xorm.io/builder v0.3.12 // indirect
xorm.io/builder v0.3.13 // indirect
xorm.io/xorm v1.3.2 // indirect
)
3 changes: 2 additions & 1 deletion src/rpstir2-chainvalidate/asadb.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func updateAsasDb(chains *Chains, wg *sync.WaitGroup) {
start := time.Now()
session, err := xormdb.NewSession()
if err != nil {
belogs.Error("updateAsasDb(): NewSession fail:", err)
return
}
defer session.Close()
Expand Down Expand Up @@ -68,7 +69,7 @@ func updateAsaDb(session *xorm.Session, chains *Chains, asaId uint64) (err error
}

chainDbAsaModel := NewChainDbAsaModel(&chainAsa)
originModel := model.JudgeOrigin(chainAsa.FilePath)
originModel := model.JudgeOriginByFilePath(chainAsa.FilePath)

chainCerts := jsonutil.MarshalJson(*chainDbAsaModel)
state := jsonutil.MarshalJson(chainAsa.StateModel)
Expand Down
3 changes: 2 additions & 1 deletion src/rpstir2-chainvalidate/cerdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func updateCersDb(chains *Chains, wg *sync.WaitGroup) {
start := time.Now()
session, err := xormdb.NewSession()
if err != nil {
belogs.Error("updateCersDb(): NewSession fail:", err)
return
}
defer session.Close()
Expand Down Expand Up @@ -67,7 +68,7 @@ func updateCerDb(session *xorm.Session, chains *Chains, cerId uint64) (err error
}

chainDbCerModel := NewChainDbCerModel(&chainCer)
originModel := model.JudgeOrigin(chainCer.FilePath)
originModel := model.JudgeOriginByFilePath(chainCer.FilePath)
belogs.Debug("updateCerDb():chainDbCerModel, id, len(chainDbCerModel.ChildChainCers):", chainDbCerModel.Id,
len(chainDbCerModel.ChildChainCers), originModel)

Expand Down
4 changes: 2 additions & 2 deletions src/rpstir2-chainvalidate/chainvalidatehttp.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func ChainValidateStart(c *gin.Context) {
// leave serviceState
if err != nil {
// will end this whole sync
belogs.Error("ParseValidateStart(): chainValidateStart fail", err)
belogs.Error("ChainValidateStart(): chainValidateStart fail", err)
httpclient.Post(rpstir2Url+"/sys/servicestate", `{"operate":"leave","state":"end"}`, false)
} else {
// leave serviceState
Expand All @@ -41,7 +41,7 @@ func ChainValidateStart(c *gin.Context) {

// call roahistory
//go httpclient.Post(rpstir2Url+"/roahistory/start", "", false)
belogs.Info("ParseValidateStart(): end, nextStep is :", nextStep)
belogs.Info("ChainValidateStart(): end, nextStep is :", nextStep)
}
}()

Expand Down
Loading