|
@@ -20,7 +20,7 @@ import (
|
|
)
|
|
)
|
|
|
|
|
|
func BenchmarkHotPath(b *testing.B) {
|
|
func BenchmarkHotPath(b *testing.B) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, _, _, _ := newSimpleServer(ca, caKey, "me", net.IP{10, 0, 0, 1}, nil)
|
|
myControl, _, _, _ := newSimpleServer(ca, caKey, "me", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
|
|
|
|
@@ -44,7 +44,7 @@ func BenchmarkHotPath(b *testing.B) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestGoodHandshake(t *testing.T) {
|
|
func TestGoodHandshake(t *testing.T) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me", net.IP{10, 0, 0, 1}, nil)
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
|
|
|
|
@@ -95,7 +95,7 @@ func TestGoodHandshake(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestWrongResponderHandshake(t *testing.T) {
|
|
func TestWrongResponderHandshake(t *testing.T) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
// The IPs here are chosen on purpose:
|
|
// The IPs here are chosen on purpose:
|
|
// The current remote handling will sort by preference, public, and then lexically.
|
|
// The current remote handling will sort by preference, public, and then lexically.
|
|
@@ -164,7 +164,7 @@ func TestStage1Race(t *testing.T) {
|
|
// This tests ensures that two hosts handshaking with each other at the same time will allow traffic to flow
|
|
// This tests ensures that two hosts handshaking with each other at the same time will allow traffic to flow
|
|
// But will eventually collapse down to a single tunnel
|
|
// But will eventually collapse down to a single tunnel
|
|
|
|
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, nil)
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
|
|
|
|
@@ -241,7 +241,7 @@ func TestStage1Race(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestUncleanShutdownRaceLoser(t *testing.T) {
|
|
func TestUncleanShutdownRaceLoser(t *testing.T) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, nil)
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
|
|
|
|
@@ -290,7 +290,7 @@ func TestUncleanShutdownRaceLoser(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestUncleanShutdownRaceWinner(t *testing.T) {
|
|
func TestUncleanShutdownRaceWinner(t *testing.T) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, nil)
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
|
|
|
|
@@ -341,7 +341,7 @@ func TestUncleanShutdownRaceWinner(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestRelays(t *testing.T) {
|
|
func TestRelays(t *testing.T) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, _, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
myControl, myVpnIpNet, _, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, _ := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, _ := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
@@ -372,7 +372,7 @@ func TestRelays(t *testing.T) {
|
|
|
|
|
|
func TestStage1RaceRelays(t *testing.T) {
|
|
func TestStage1RaceRelays(t *testing.T) {
|
|
//NOTE: this is a race between me and relay resulting in a full tunnel from me to them via relay
|
|
//NOTE: this is a race between me and relay resulting in a full tunnel from me to them via relay
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, _ := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, _ := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
@@ -421,7 +421,7 @@ func TestStage1RaceRelays(t *testing.T) {
|
|
|
|
|
|
func TestStage1RaceRelays2(t *testing.T) {
|
|
func TestStage1RaceRelays2(t *testing.T) {
|
|
//NOTE: this is a race between me and relay resulting in a full tunnel from me to them via relay
|
|
//NOTE: this is a race between me and relay resulting in a full tunnel from me to them via relay
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, _ := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, _ := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
@@ -508,7 +508,7 @@ func TestStage1RaceRelays2(t *testing.T) {
|
|
////TODO: assert hostmaps
|
|
////TODO: assert hostmaps
|
|
}
|
|
}
|
|
func TestRehandshakingRelays(t *testing.T) {
|
|
func TestRehandshakingRelays(t *testing.T) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, _, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
myControl, myVpnIpNet, _, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 1}, m{"relay": m{"use_relays": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, relayConfig := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, relayConfig := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 128}, m{"relay": m{"am_relay": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
@@ -538,7 +538,7 @@ func TestRehandshakingRelays(t *testing.T) {
|
|
// When I update the certificate for the relay, both me and them will have 2 host infos for the relay,
|
|
// When I update the certificate for the relay, both me and them will have 2 host infos for the relay,
|
|
// and the main host infos will not have any relay state to handle the me<->relay<->them tunnel.
|
|
// and the main host infos will not have any relay state to handle the me<->relay<->them tunnel.
|
|
r.Log("Renew relay certificate and spin until me and them sees it")
|
|
r.Log("Renew relay certificate and spin until me and them sees it")
|
|
- _, _, myNextPrivKey, myNextPEM := newTestCert(ca, caKey, "relay", time.Now(), time.Now().Add(5*time.Minute), relayVpnIpNet, nil, []string{"new group"})
|
|
|
|
|
|
+ _, _, myNextPrivKey, myNextPEM := NewTestCert(ca, caKey, "relay", time.Now(), time.Now().Add(5*time.Minute), relayVpnIpNet, nil, []string{"new group"})
|
|
|
|
|
|
caB, err := ca.MarshalToPEM()
|
|
caB, err := ca.MarshalToPEM()
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -612,7 +612,7 @@ func TestRehandshakingRelays(t *testing.T) {
|
|
|
|
|
|
func TestRehandshakingRelaysPrimary(t *testing.T) {
|
|
func TestRehandshakingRelaysPrimary(t *testing.T) {
|
|
// This test is the same as TestRehandshakingRelays but one of the terminal types is a primary swap winner
|
|
// This test is the same as TestRehandshakingRelays but one of the terminal types is a primary swap winner
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, _, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 128}, m{"relay": m{"use_relays": true}})
|
|
myControl, myVpnIpNet, _, _ := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 128}, m{"relay": m{"use_relays": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, relayConfig := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 1}, m{"relay": m{"am_relay": true}})
|
|
relayControl, relayVpnIpNet, relayUdpAddr, relayConfig := newSimpleServer(ca, caKey, "relay ", net.IP{10, 0, 0, 1}, m{"relay": m{"am_relay": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them ", net.IP{10, 0, 0, 2}, m{"relay": m{"use_relays": true}})
|
|
@@ -642,7 +642,7 @@ func TestRehandshakingRelaysPrimary(t *testing.T) {
|
|
// When I update the certificate for the relay, both me and them will have 2 host infos for the relay,
|
|
// When I update the certificate for the relay, both me and them will have 2 host infos for the relay,
|
|
// and the main host infos will not have any relay state to handle the me<->relay<->them tunnel.
|
|
// and the main host infos will not have any relay state to handle the me<->relay<->them tunnel.
|
|
r.Log("Renew relay certificate and spin until me and them sees it")
|
|
r.Log("Renew relay certificate and spin until me and them sees it")
|
|
- _, _, myNextPrivKey, myNextPEM := newTestCert(ca, caKey, "relay", time.Now(), time.Now().Add(5*time.Minute), relayVpnIpNet, nil, []string{"new group"})
|
|
|
|
|
|
+ _, _, myNextPrivKey, myNextPEM := NewTestCert(ca, caKey, "relay", time.Now(), time.Now().Add(5*time.Minute), relayVpnIpNet, nil, []string{"new group"})
|
|
|
|
|
|
caB, err := ca.MarshalToPEM()
|
|
caB, err := ca.MarshalToPEM()
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -715,7 +715,7 @@ func TestRehandshakingRelaysPrimary(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestRehandshaking(t *testing.T) {
|
|
func TestRehandshaking(t *testing.T) {
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, myConfig := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 2}, nil)
|
|
myControl, myVpnIpNet, myUdpAddr, myConfig := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, theirConfig := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, theirConfig := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 1}, nil)
|
|
|
|
|
|
@@ -737,7 +737,7 @@ func TestRehandshaking(t *testing.T) {
|
|
r.RenderHostmaps("Starting hostmaps", myControl, theirControl)
|
|
r.RenderHostmaps("Starting hostmaps", myControl, theirControl)
|
|
|
|
|
|
r.Log("Renew my certificate and spin until their sees it")
|
|
r.Log("Renew my certificate and spin until their sees it")
|
|
- _, _, myNextPrivKey, myNextPEM := newTestCert(ca, caKey, "me", time.Now(), time.Now().Add(5*time.Minute), myVpnIpNet, nil, []string{"new group"})
|
|
|
|
|
|
+ _, _, myNextPrivKey, myNextPEM := NewTestCert(ca, caKey, "me", time.Now(), time.Now().Add(5*time.Minute), myVpnIpNet, nil, []string{"new group"})
|
|
|
|
|
|
caB, err := ca.MarshalToPEM()
|
|
caB, err := ca.MarshalToPEM()
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -811,7 +811,7 @@ func TestRehandshaking(t *testing.T) {
|
|
func TestRehandshakingLoser(t *testing.T) {
|
|
func TestRehandshakingLoser(t *testing.T) {
|
|
// The purpose of this test is that the race loser renews their certificate and rehandshakes. The final tunnel
|
|
// The purpose of this test is that the race loser renews their certificate and rehandshakes. The final tunnel
|
|
// Should be the one with the new certificate
|
|
// Should be the one with the new certificate
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, myConfig := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 2}, nil)
|
|
myControl, myVpnIpNet, myUdpAddr, myConfig := newSimpleServer(ca, caKey, "me ", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, theirConfig := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, theirConfig := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 1}, nil)
|
|
|
|
|
|
@@ -837,7 +837,7 @@ func TestRehandshakingLoser(t *testing.T) {
|
|
r.RenderHostmaps("Starting hostmaps", myControl, theirControl)
|
|
r.RenderHostmaps("Starting hostmaps", myControl, theirControl)
|
|
|
|
|
|
r.Log("Renew their certificate and spin until mine sees it")
|
|
r.Log("Renew their certificate and spin until mine sees it")
|
|
- _, _, theirNextPrivKey, theirNextPEM := newTestCert(ca, caKey, "them", time.Now(), time.Now().Add(5*time.Minute), theirVpnIpNet, nil, []string{"their new group"})
|
|
|
|
|
|
+ _, _, theirNextPrivKey, theirNextPEM := NewTestCert(ca, caKey, "them", time.Now(), time.Now().Add(5*time.Minute), theirVpnIpNet, nil, []string{"their new group"})
|
|
|
|
|
|
caB, err := ca.MarshalToPEM()
|
|
caB, err := ca.MarshalToPEM()
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -912,7 +912,7 @@ func TestRaceRegression(t *testing.T) {
|
|
// This test forces stage 1, stage 2, stage 1 to be received by me from them
|
|
// This test forces stage 1, stage 2, stage 1 to be received by me from them
|
|
// We had a bug where we were not finding the duplicate handshake and responding to the final stage 1 which
|
|
// We had a bug where we were not finding the duplicate handshake and responding to the final stage 1 which
|
|
// caused a cross-linked hostinfo
|
|
// caused a cross-linked hostinfo
|
|
- ca, _, caKey, _ := newTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
|
|
|
|
+ ca, _, caKey, _ := NewTestCaCert(time.Now(), time.Now().Add(10*time.Minute), []*net.IPNet{}, []*net.IPNet{}, []string{})
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me", net.IP{10, 0, 0, 1}, nil)
|
|
myControl, myVpnIpNet, myUdpAddr, _ := newSimpleServer(ca, caKey, "me", net.IP{10, 0, 0, 1}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
theirControl, theirVpnIpNet, theirUdpAddr, _ := newSimpleServer(ca, caKey, "them", net.IP{10, 0, 0, 2}, nil)
|
|
|
|
|