Skip to content

Commit 414f9d0

Browse files
FR4NK-WFR4NK-W
authored
Refactor: consistently use netip (#21)
* Refactor: consistently use netip Pass resolver addresses as netip address in DNSInfo Update to Go 1.21 Update test vector with update TRC and certificates
1 parent 95649ef commit 414f9d0

File tree

10 files changed

+123
-125
lines changed

10 files changed

+123
-125
lines changed

‎bootstrap.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,14 @@ func (b *Bootstrapper) tryBootstrapping() error {
7171
hinting.NewMockHintGenerator(&cfg.MOCK),
7272
// Gets DNS information from IPv6 RAs
7373
hinting.NewIPv6HintGenerator(&cfg.IPv6, b.iface),
74+
// Gets DHCP(v6) hints
7475
hinting.NewDHCPv6HintGenerator(&cfg.DHCPv6, b.iface),
7576
hinting.NewDHCPHintGenerator(&cfg.DHCP, b.iface),
76-
// XXX: DNS-SD depends on DNS resolution working, which can depend on DHCP for getting the local DNS resolver IP
77+
// Note: DNS-SD depends on DNS resolution working,
78+
// which can depend on DHCP for getting the local DNS resolver IP
7779
hinting.NewDNSSDHintGenerator(&cfg.DNSSD),
78-
// XXX: mDNS depends on the DNS search domain to be correct, which can depend on DHCP for getting it
80+
// Note: mDNS depends on the DNS search domain to be correct,
81+
// which can depend on DHCP for getting it
7982
hinting.NewMDNSHintGenerator(&cfg.MDNS, b.iface))
8083
wg := sync.WaitGroup{}
8184
for _, g := range hintGenerators {

‎fetcher/scion_cppki_verify_test.go‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -30,114 +30,114 @@ import (
3030
// https://github.com/netsec-ethz/scionlab/blob/develop/scionlab/tests/data/test_config_tar/
3131

3232
var isd17B1S1trc = `-----BEGIN TRC-----
33-
MIIMEAYJKoZIhvcNAQcCoIIMATCCC/0CAQExDzANBglghkgBZQMEAgMFADCCCHIG
34-
CSqGSIb3DQEHAaCCCGMEgghfMIIIWwIBADAJAgERAgEBAgEBMCIYDzIwMjMwMjE1
35-
MTQ0MzU4WhgPMjAyNTAyMTQxNDQzNTdaAgEAAQEAMAACAQEwDRMLZmZhYTowOjEx
36-
MDEwDRMLZmZhYTowOjExMDEMF1NDSU9OTGFiIFRSQyBmb3IgSVNEIDE3MIIH4zCC
37-
ApEwggI3oAMCAQICFBuNETHZYM/xYgcjlx5VOWDmoO5rMAoGCCqGSM49BAMEMIGl
33+
MIIMDgYJKoZIhvcNAQcCoIIL/zCCC/sCAQExDzANBglghkgBZQMEAgMFADCCCHAG
34+
CSqGSIb3DQEHAaCCCGEEgghdMIIIWQIBADAJAgERAgEBAgEBMCIYDzIwMjQwNzIy
35+
MTE0ODQyWhgPMjAyNjA3MjIxMTQ4NDFaAgEAAQEAMAACAQEwDRMLZmZhYTowOjEx
36+
MDEwDRMLZmZhYTowOjExMDEMF1NDSU9OTGFiIFRSQyBmb3IgSVNEIDE3MIIH4TCC
37+
ApEwggI3oAMCAQICFD/uqgmbefTm3rDU6n/cAZBz0BahMAoGCCqGSM49BAMEMIGl
3838
MQswCQYDVQQGEwJDSDELMAkGA1UECAwCWkgxEDAOBgNVBAcMB1rDvHJpY2gxDzAN
3939
BgNVBAoMBk5ldHNlYzEPMA0GA1UECwwGTmV0c2VjMTQwMgYDVQQDDCsxNy1mZmFh
4040
OjA6MTEwMSBTZW5zaXRpdmUgVm90aW5nIENlcnRpZmljYXRlMR8wHQYLKwYBBAGD
41-
sBwBAgEMDjE3LWZmYWE6MDoxMTAxMB4XDTIzMDIxNTE0NDM1OFoXDTI1MDIxNDE0
42-
NDM1OFowgaUxCzAJBgNVBAYTAkNIMQswCQYDVQQIDAJaSDEQMA4GA1UEBwwHWsO8
41+
sBwBAgEMDjE3LWZmYWE6MDoxMTAxMB4XDTI0MDcyMjExNDg0MloXDTI2MDcyMjEx
42+
NDg0MlowgaUxCzAJBgNVBAYTAkNIMQswCQYDVQQIDAJaSDEQMA4GA1UEBwwHWsO8
4343
cmljaDEPMA0GA1UECgwGTmV0c2VjMQ8wDQYDVQQLDAZOZXRzZWMxNDAyBgNVBAMM
4444
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
6767
c2VjMTYwNAYDVQQDDC0xNy1mZmFhOjA6MTEwMSBIaWdoIFNlY3VyaXR5IFJvb3Qg
6868
Q2VydGlmaWNhdGUxHzAdBgsrBgEEAYOwHAECAQwOMTctZmZhYTowOjExMDEwHhcN
69-
MjMwMjE1MTQ0MzU4WhcNMjUwMjE0MTQ0MzU4WjCBpzELMAkGA1UEBhMCQ0gxCzAJ
69+
MjQwNzIyMTE0ODQyWhcNMjYwNzIyMTE0ODQyWjCBpzELMAkGA1UEBhMCQ0gxCzAJ
7070
BgNVBAgMAlpIMRAwDgYDVQQHDAdaw7xyaWNoMQ8wDQYDVQQKDAZOZXRzZWMxDzAN
7171
BgNVBAsMBk5ldHNlYzE2MDQGA1UEAwwtMTctZmZhYTowOjExMDEgSGlnaCBTZWN1
7272
cml0eSBSb290IENlcnRpZmljYXRlMR8wHQYLKwYBBAGDsBwBAgEMDjE3LWZmYWE6
73-
MDoxMTAxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEaJhWyZh97ANYKMr9PnkQ
74-
EGEAJjQIHiaPDweTcRx2JETXT3AQX019+7IjI+c4qgUg5I0sMh4zRZQVmOJi/SCG
75-
O6NnMGUwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
76-
BBYEFPDJcfY8dggKFPq1Q4HDX/2mbN3/MCAGA1UdJQQZMBcGCysGAQQBg7AcAQMD
77-
BggrBgEFBQcDCDAKBggqhkjOPQQDBANJADBGAiEAqpEg+Fxg3qdNwkhJHKSdDQuf
78-
MdouXWKMPDbD5Gb0EdQCIQDp7upCx0QhnHGNfb6hgS7SgIWRDkosvovDlrGoWJcK
79-
1jGCA28wggGyAgEBMIG8MIGjMQswCQYDVQQGEwJDSDELMAkGA1UECAwCWkgxEDAO
80-
BgNVBAcMB1rDvHJpY2gxDzANBgNVBAoMBk5ldHNlYzEPMA0GA1UECwwGTmV0c2Vj
81-
MTIwMAYDVQQDDCkxNy1mZmFhOjA6MTEwMSBSZWd1bGFyIFZvdGluZyBDZXJ0aWZp
82-
Y2F0ZTEfMB0GCysGAQQBg7AcAQIBDA4xNy1mZmFhOjA6MTEwMQIUeckHdetk6x92
83-
gtS074dpgwpHVf8wDQYJYIZIAWUDBAIDBQCggYkwGAYJKoZIhvcNAQkDMQsGCSqG
84-
SIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjMwMjE1MTQ0MzU5WjBPBgkqhkiG9w0B
85-
CQQxQgRASTesPZKyy6R7WPMLJJdWdawgz6QtEHpxVVtHVFrz7uSTQXNftqHXjUT0
86-
yD7LLiXoiEe0c9Ihr6Fy6J9Ofo+/GDAKBggqhkjOPQQDBARHMEUCIGSVS/h8fZL2
87-
yMvAMQYeIc+fr3dwZKbgFvS48wyBPMz7AiEAmbgKv3+UUczZNr7FYMPmpg0wwBUh
88-
qf8QrA6aQHQ3G80wggG1AgEBMIG+MIGlMQswCQYDVQQGEwJDSDELMAkGA1UECAwC
89-
WkgxEDAOBgNVBAcMB1rDvHJpY2gxDzANBgNVBAoMBk5ldHNlYzEPMA0GA1UECwwG
90-
TmV0c2VjMTQwMgYDVQQDDCsxNy1mZmFhOjA6MTEwMSBTZW5zaXRpdmUgVm90aW5n
91-
IENlcnRpZmljYXRlMR8wHQYLKwYBBAGDsBwBAgEMDjE3LWZmYWE6MDoxMTAxAhQb
92-
jREx2WDP8WIHI5ceVTlg5qDuazANBglghkgBZQMEAgMFAKCBiTAYBgkqhkiG9w0B
93-
CQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMzAyMTUxNDQzNTlaME8G
94-
CSqGSIb3DQEJBDFCBEBJN6w9krLLpHtY8wskl1Z1rCDPpC0QenFVW0dUWvPu5JNB
95-
c1+2odeNRPTIPssuJeiIR7Rz0iGvoXLon05+j78YMAoGCCqGSM49BAMEBEgwRgIh
96-
AJSRtv19MnigUbdYJwqZrIK+EOfqZypjLm/pw4O0E5/yAiEA8FMVcvlxwWFjqySz
97-
KZVd5ErwYR3A6zIVGydZL4o1UnA=
73+
MDoxMTAxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEWfsOTofp8w50kcmctdEB
74+
viMxyWxRF8srSORFWHvj82sZKIhAszNb9V7l1t0PXyii93rX/PjPMJYI+fJiXCZB
75+
x6NnMGUwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
76+
BBYEFB5joICvEb/gRBbLvdAOvl9xMC0MMCAGA1UdJQQZMBcGCysGAQQBg7AcAQMD
77+
BggrBgEFBQcDCDAKBggqhkjOPQQDBANHADBEAiAnDYoEvokvrFnusIOJ726VPazg
78+
3dG7Eh9DNjkLPQ5/QQIgT34EY+b6zaFowChsVNYApAYvb8wIAsErjUf7lKEKL2cx
79+
ggNvMIIBsgIBATCBvDCBozELMAkGA1UEBhMCQ0gxCzAJBgNVBAgMAlpIMRAwDgYD
80+
VQQHDAdaw7xyaWNoMQ8wDQYDVQQKDAZOZXRzZWMxDzANBgNVBAsMBk5ldHNlYzEy
81+
MDAGA1UEAwwpMTctZmZhYTowOjExMDEgUmVndWxhciBWb3RpbmcgQ2VydGlmaWNh
82+
dGUxHzAdBgsrBgEEAYOwHAECAQwOMTctZmZhYTowOjExMDECFH/7O9YE4Iaf92Pa
83+
zG0CR7TQXoTDMA0GCWCGSAFlAwQCAwUAoIGJMBgGCSqGSIb3DQEJAzELBgkqhkiG
84+
9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTI0MDcyMjExNDg0MlowTwYJKoZIhvcNAQkE
85+
MUIEQL9c/KH+dti9iUPhyYH12CTTFSvy2kKDNS3+AlfhwzmoNlef0krV04/qQXaF
86+
ax4IERuwh/VnseBEKeZTUf/diYEwCgYIKoZIzj0EAwQERzBFAiEApwJf+lE3zvJv
87+
ty98jgMHpygiZDAIjXKmDJT0jZo4H1ICIEtou8HXZtpS1WJR24lqqNWNjoLUt5nj
88+
6Equpiu8sp7cMIIBtQIBATCBvjCBpTELMAkGA1UEBhMCQ0gxCzAJBgNVBAgMAlpI
89+
MRAwDgYDVQQHDAdaw7xyaWNoMQ8wDQYDVQQKDAZOZXRzZWMxDzANBgNVBAsMBk5l
90+
dHNlYzE0MDIGA1UEAwwrMTctZmZhYTowOjExMDEgU2Vuc2l0aXZlIFZvdGluZyBD
91+
ZXJ0aWZpY2F0ZTEfMB0GCysGAQQBg7AcAQIBDA4xNy1mZmFhOjA6MTEwMQIUP+6q
92+
CZt59ObesNTqf9wBkHPQFqEwDQYJYIZIAWUDBAIDBQCggYkwGAYJKoZIhvcNAQkD
93+
MQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjQwNzIyMTE0ODQyWjBPBgkq
94+
hkiG9w0BCQQxQgRAv1z8of522L2JQ+HJgfXYJNMVK/LaQoM1Lf4CV+HDOag2V5/S
95+
StXTj+pBdoVrHggRG7CH9Wex4EQp5lNR/92JgTAKBggqhkjOPQQDBARIMEYCIQCw
96+
S9WE48jwNLqW06cFzhOPpRBhGAeyp6bX0+iTO8yjbwIhALYTnkLzmEjk5sWl0jSf
97+
VgVqDErwS+kG7NSSQ4iYzgxM
9898
-----END TRC-----`
9999

100100
var isd17ASffaa_0_1101CAcrt = `-----BEGIN CERTIFICATE-----
101-
MIICsDCCAlWgAwIBAgIUCk2LCWPJmH+HTnzejH23ufp3KrEwCgYIKoZIzj0EAwQw
101+
MIICrzCCAlWgAwIBAgIUTdevyKSS1VO3LrNZrJ7oJ+QgrmgwCgYIKoZIzj0EAwQw
102102
gacxCzAJBgNVBAYTAkNIMQswCQYDVQQIDAJaSDEQMA4GA1UEBwwHWsO8cmljaDEP
103103
MA0GA1UECgwGTmV0c2VjMQ8wDQYDVQQLDAZOZXRzZWMxNjA0BgNVBAMMLTE3LWZm
104104
YWE6MDoxMTAxIEhpZ2ggU2VjdXJpdHkgUm9vdCBDZXJ0aWZpY2F0ZTEfMB0GCysG
105-
AQQBg7AcAQIBDA4xNy1mZmFhOjA6MTEwMTAeFw0yMzAyMTUxNDQzNThaFw0yNTAy
106-
MTQxNDQzNThaMIGeMQswCQYDVQQGEwJDSDELMAkGA1UECAwCWkgxEDAOBgNVBAcM
105+
AQQBg7AcAQIBDA4xNy1mZmFhOjA6MTEwMTAeFw0yNDA3MjIxMTQ4NDJaFw0yNjA3
106+
MjIxMTQ4NDJaMIGeMQswCQYDVQQGEwJDSDELMAkGA1UECAwCWkgxEDAOBgNVBAcM
107107
B1rDvHJpY2gxDzANBgNVBAoMBk5ldHNlYzEPMA0GA1UECwwGTmV0c2VjMS0wKwYD
108108
VQQDDCQxNy1mZmFhOjA6MTEwMSBTZWN1cmUgQ0EgQ2VydGlmaWNhdGUxHzAdBgsr
109109
BgEEAYOwHAECAQwOMTctZmZhYTowOjExMDEwWTATBgcqhkjOPQIBBggqhkjOPQMB
110-
BwNCAASBOUu7asgUTJ4R0qeYm77sm4TVx3go766Yw6fCtYPJtLay8daJFkVg0WhS
111-
FD5pLDFs7tgE5Pu3nzi5FkjBGxBpo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4G
112-
A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUWwjNBu9ss2/1br0cHz7bagsqSMowHwYD
113-
VR0jBBgwFoAU8Mlx9jx2CAoU+rVDgcNf/aZs3f8wCgYIKoZIzj0EAwQDSQAwRgIh
114-
AKkTwJJp0XDjxuAh1O2kxLXXpsd5XXTuLgasZNxOe8hbAiEAlrJAcVvMKXrtlYYj
115-
fUDNUANFjcVS5s1s6A08JQKcstw=
110+
BwNCAARhVXWu18dA+MgaZTCx/VM7vaeLYYjOyOxFTZdb7l4dAYYc5LZkXENoJ8pU
111+
jmZCKXCpHhkhgnIpWqCwIt0FeLz9o2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4G
112+
A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUu1K5rwKbsos1r3rvRl/G3NXVmLcwHwYD
113+
VR0jBBgwFoAUHmOggK8Rv+BEFsu90A6+X3EwLQwwCgYIKoZIzj0EAwQDSAAwRQIh
114+
AKTEUa4imwBZ+CBzfEqeL1ZJv5NWujGgVASBHXE+mEr4AiAaebLtTX7+rLgj81aS
115+
13br6BlaEnQlsiZnxibTuPAd7A==
116116
-----END CERTIFICATE-----`
117117

118-
var isd17ASffaa_1_1aspem = `-----BEGIN CERTIFICATE-----
119-
MIICrzCCAlSgAwIBAgIUd8MdryawbWzwMTUQLKElZEDQWOYwCgYIKoZIzj0EAwQw
118+
var isd17ASffaa_0_1101aspem = `-----BEGIN CERTIFICATE-----
119+
MIICtTCCAlqgAwIBAgIUOVv660twJ/eYaKOsOg2RzitpHc4wCgYIKoZIzj0EAwQw
120120
gZ4xCzAJBgNVBAYTAkNIMQswCQYDVQQIDAJaSDEQMA4GA1UEBwwHWsO8cmljaDEP
121121
MA0GA1UECgwGTmV0c2VjMQ8wDQYDVQQLDAZOZXRzZWMxLTArBgNVBAMMJDE3LWZm
122122
YWE6MDoxMTAxIFNlY3VyZSBDQSBDZXJ0aWZpY2F0ZTEfMB0GCysGAQQBg7AcAQIB
123-
DA4xNy1mZmFhOjA6MTEwMTAeFw0yMzAyMTUxNDQ0MDNaFw0yNDAyMTUxNDQ0MDNa
124-
MIGRMQswCQYDVQQGEwJDSDELMAkGA1UECAwCWkgxEDAOBgNVBAcMB1rDvHJpY2gx
125-
DzANBgNVBAoMBk5ldHNlYzEPMA0GA1UECwwGTmV0c2VjMSMwIQYDVQQDDBoxNy1m
126-
ZmFhOjE6MSBBUyBDZXJ0aWZpY2F0ZTEcMBoGCysGAQQBg7AcAQIBDAsxNy1mZmFh
127-
OjE6MTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIAFFOt094DKoITkHskSxXZ8
128-
3z2VtcusVCdNbklQjVBgwLp+BuTxRwMJ0fWRpFakAhzmK6JfEUw3g0Xi4JJ4Onej
129-
ezB5MA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU1JsM6Yeenp5IYhgzKFF7yqBc
130-
ac8wHwYDVR0jBBgwFoAUWwjNBu9ss2/1br0cHz7bagsqSMowJwYDVR0lBCAwHgYI
131-
KwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDCDAKBggqhkjOPQQDBANJADBGAiEA
132-
tiLJjcqwtG37/cGJS6o4OoqxdbFhtUjaebGmOpZOh10CIQCWDErkumcjRCHnKHU8
133-
CgzgjvtU06dNQ5tABcjOBFX4rA==
123+
DA4xNy1mZmFhOjA6MTEwMTAeFw0yNDA3MjIxMTQ4NDJaFw0yNTA3MjIxMTQ4NDJa
124+
MIGXMQswCQYDVQQGEwJDSDELMAkGA1UECAwCWkgxEDAOBgNVBAcMB1rDvHJpY2gx
125+
DzANBgNVBAoMBk5ldHNlYzEPMA0GA1UECwwGTmV0c2VjMSYwJAYDVQQDDB0xNy1m
126+
ZmFhOjA6MTEwMSBBUyBDZXJ0aWZpY2F0ZTEfMB0GCysGAQQBg7AcAQIBDA4xNy1m
127+
ZmFhOjA6MTEwMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDIMOw7O/PgoJtXY
128+
JwBop/NYrnqIDfTPKj3E6G5uOnBxhvY4mo+1GB6VgI1boBvVliXAVSfM7RMS2763
129+
iwiMys+jezB5MA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUyRyKkoeOfA6+JLHd
130+
skjJ2RSOPucwHwYDVR0jBBgwFoAUu1K5rwKbsos1r3rvRl/G3NXVmLcwJwYDVR0l
131+
BCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDCDAKBggqhkjOPQQDBANJ
132+
ADBGAiEAwqKO0vU3f+pq3PfH3t2DwZACgnMLIxAe2XLNMy12lIsCIQCMdSg78v9O
133+
961vFunX4kWAqiaVNGe5vQV5Pz2AWM+FMw==
134134
-----END CERTIFICATE-----
135135
`
136136

137-
var isd17ASffaa_1_1cpASkey = `-----BEGIN PRIVATE KEY-----
138-
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8SUQUUkU+AD4LtTj
139-
Wxan3smVVLh57gz+hm/6T2Xv+nGhRANCAASABRTrdPeAyqCE5B7JEsV2fN89lbXL
140-
rFQnTW5JUI1QYMC6fgbk8UcDCdH1kaRWpAIc5iuiXxFMN4NF4uCSeDp3
137+
var isd17ASffaa_0_1101cpASkey = `-----BEGIN PRIVATE KEY-----
138+
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgkd1/PwHX8+P8Crr4
139+
vS/xUhH2K4nt9l4xFAuwzrZ6aIehRANCAAQyDDsOzvz4KCbV2CcAaKfzWK56iA30
140+
zyo9xOhubjpwcYb2OJqPtRgelYCNW6Ab1ZYlwFUnzO0TEtu+t4sIjMrP
141141
-----END PRIVATE KEY-----`
142142

143143
var payload = `{
@@ -173,7 +173,7 @@ var payload = `{
173173
"addr": "127.0.0.1:30254"
174174
}
175175
},
176-
"isd_as": "17-ffaa:1:1",
176+
"isd_as": "17-ffaa:0:1101",
177177
"mtu": 1472,
178178
"sigs": {
179179
"sig-1": {
@@ -195,12 +195,12 @@ func TestVerify(t *testing.T) {
195195
if err != nil {
196196
log.Error("Failed to create sign test directory for testrun", "dir", signPath, "err", err)
197197
}
198-
// Dump files payload, isd17ASffaa_0_1101CAcrt, isd17ASffaa_1_1aspem, isd17ASffaa_1_1cpASkey to directory sign
198+
// Dump files payload, isd17ASffaa_0_1101CAcrt, isd17ASffaa_0_1101aspem, isd17ASffaa_0_1101cpASkey to directory sign
199199
files := map[string]string{
200200
"payload": payload,
201201
"ISD17-ASffaa_0_1101.ca.crt": isd17ASffaa_0_1101CAcrt,
202-
"ISD17-ASffaa_1_1.as.pem": isd17ASffaa_1_1aspem,
203-
"ISD17-ASffaa_1_1.cp.as.key": isd17ASffaa_1_1cpASkey}
202+
"ISD17-ASffaa_0_1101.as.pem": isd17ASffaa_0_1101aspem,
203+
"ISD17-ASffaa_0_1101.cp.as.key": isd17ASffaa_0_1101cpASkey}
204204
for fileName, fileContent := range files {
205205
filePath := filepath.Join(signPath, fileName)
206206
err = os.WriteFile(filePath, []byte(fileContent), 0666)
@@ -210,8 +210,8 @@ func TestVerify(t *testing.T) {
210210
}
211211
payloadPath := filepath.Join(signPath, "payload")
212212
signedPayloadPath := filepath.Join(signPath, "payload.signed")
213-
asKeyPath := filepath.Join(signPath, "ISD17-ASffaa_1_1.cp.as.key")
214-
asCertPath := filepath.Join(signPath, "ISD17-ASffaa_1_1.as.pem")
213+
asKeyPath := filepath.Join(signPath, "ISD17-ASffaa_0_1101.cp.as.key")
214+
asCertPath := filepath.Join(signPath, "ISD17-ASffaa_0_1101.as.pem")
215215
caCertPath := filepath.Join(signPath, "ISD17-ASffaa_0_1101.ca.crt")
216216
err = exec.Command("openssl", "cms", "-sign", "-text",
217217
"-in", payloadPath, "-out", signedPayloadPath, "-inkey", asKeyPath,
@@ -270,12 +270,12 @@ func TestExtractSignerInfo(t *testing.T) {
270270
if err != nil {
271271
log.Error("Failed to create test directory for testrun", "dir", tmpDir, "err", err)
272272
}
273-
// Dump files payload, isd17ASffaa_0_1101CAcrt, isd17ASffaa_1_1aspem, isd17ASffaa_1_1cpASkey to directory sign
273+
// Dump files payload, isd17ASffaa_0_1101CAcrt, isd17ASffaa_0_1101aspem, isd17ASffaa_0_1101cpASkey to directory sign
274274
files := map[string]string{
275275
"payload": payload,
276276
"ISD17-ASffaa_0_1101.ca.crt": isd17ASffaa_0_1101CAcrt,
277-
"ISD17-ASffaa_1_1.as.pem": isd17ASffaa_1_1aspem,
278-
"ISD17-ASffaa_1_1.cp.as.key": isd17ASffaa_1_1cpASkey}
277+
"ISD17-ASffaa_0_1101.as.pem": isd17ASffaa_0_1101aspem,
278+
"ISD17-ASffaa_0_1101.cp.as.key": isd17ASffaa_0_1101cpASkey}
279279
for fileName, fileContent := range files {
280280
filePath := filepath.Join(tmpDir, fileName)
281281
err = os.WriteFile(filePath, []byte(fileContent), 0666)
@@ -285,16 +285,16 @@ func TestExtractSignerInfo(t *testing.T) {
285285
}
286286
payloadPath := filepath.Join(tmpDir, "payload")
287287
signedPayloadPath := filepath.Join(tmpDir, "payload.signed")
288-
asKeyPath := filepath.Join(tmpDir, "ISD17-ASffaa_1_1.cp.as.key")
289-
asCertPath := filepath.Join(tmpDir, "ISD17-ASffaa_1_1.as.pem")
288+
asKeyPath := filepath.Join(tmpDir, "ISD17-ASffaa_0_1101.cp.as.key")
289+
asCertPath := filepath.Join(tmpDir, "ISD17-ASffaa_0_1101.as.pem")
290290
caCertPath := filepath.Join(tmpDir, "ISD17-ASffaa_0_1101.ca.crt")
291291
err = exec.Command("openssl", "cms", "-sign", "-text",
292292
"-in", payloadPath, "-out", signedPayloadPath, "-inkey", asKeyPath,
293293
"-signer", asCertPath, "-certfile", caCertPath).Run()
294294
if err != nil {
295295
log.Error("Failed to create signed file", "signedPayloadPath", signedPayloadPath, "err", err)
296296
}
297-
signerTRCid, signerIA, asCertChainPath, err := extractSignerInfo(context.WithValue(context.TODO(), "openssl", false), signedPayloadPath, tmpDir)
297+
signerTRCid, signerIA, asCertChainPath, err := extractSignerInfo(context.WithValue(context.TODO(), "nativeCrypto", false), signedPayloadPath, tmpDir)
298298
if err != nil {
299299
log.Error("Getting signer info failed: extractSignerInfo", "err", err)
300300
t.FailNow()
@@ -303,7 +303,7 @@ func TestExtractSignerInfo(t *testing.T) {
303303
log.Error("signerTRCid mismatch", "expected", 1, "actual", signerTRCid)
304304
t.FailNow()
305305
}
306-
if signerIA != "17-ffaa:1:1" {
306+
if signerIA != "17-ffaa:0:1101" {
307307
log.Error("signerTRCid mismatch", "expected", "", "actual", signerIA)
308308
t.FailNow()
309309
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ require (
2424

2525
replace github.com/insomniacslk/dhcp => github.com/stapelberg/dhcp v0.0.0-20190429172946-5244c0daddf0
2626

27-
go 1.18
27+
go 1.21

‎go.sum‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
3939
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
4040
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
4141
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
42-
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E=
4342
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
4443
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
4544
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -55,22 +54,11 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
5554
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5655
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5756
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
58-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
59-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6057
golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf h1:Fm4IcnUL803i92qDlmB0obyHmosDrxZWxJL3gIeNqOw=
6158
golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
62-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
63-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
6459
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
65-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
66-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
67-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
68-
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
6960
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
7061
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
71-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
72-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
73-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
7462
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7563
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
7664
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)