denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed keyids in sql/ip-split-pools-db-restart scenario

Browse Source
This commit is contained in:
Andreas Steffen
2010-05-15 16:11:08 +02:00
parent 2948e3d0c2
commit c572f93ed7
3 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/ipsec.d/data.sql
+17 -6
View File
@@ -8,10 +8,15 @@ INSERT INTO identities (
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */ ) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def' 11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def'
); );
INSERT INTO identities (
type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
11, X'ae096b87b44886d3b820978623dabd0eae22ebbc'
);
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* [email protected] */ ) VALUES ( /* [email protected] */
@@ -20,7 +25,7 @@ INSERT INTO identities (
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, [email protected]' */ ) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, [email protected]' */
11, X'1fa1a988d9648cb5a0a2546439b4f23d745d6e7c' 11, X'1fa1a988d9648cb5a0a2546439b4f23d745d6e7c'
); );
@@ -59,7 +64,7 @@ INSERT INTO certificate_identity (
INSERT INTO certificate_identity ( INSERT INTO certificate_identity (
certificate, identity certificate, identity
) VALUES ( ) VALUES (
2, 3 1, 3
); );
INSERT INTO certificate_identity ( INSERT INTO certificate_identity (
@@ -68,6 +73,12 @@ INSERT INTO certificate_identity (
2, 4 2, 4
); );
INSERT INTO certificate_identity (
certificate, identity
) VALUES (
2, 5
);
/* Private Keys */ /* Private Keys */
INSERT INTO private_keys ( INSERT INTO private_keys (
@@ -79,13 +90,13 @@ INSERT INTO private_keys (
INSERT INTO private_key_identity ( INSERT INTO private_key_identity (
private_key, identity private_key, identity
) VALUES ( ) VALUES (
1, 3 1, 4
); );
INSERT INTO private_key_identity ( INSERT INTO private_key_identity (
private_key, identity private_key, identity
) VALUES ( ) VALUES (
1, 4 1, 5
); );
/* Configurations */ /* Configurations */
@@ -99,7 +110,7 @@ INSERT INTO ike_configs (
INSERT INTO peer_configs ( INSERT INTO peer_configs (
name, ike_cfg, local_id, remote_id, virtual name, ike_cfg, local_id, remote_id, virtual
) VALUES ( ) VALUES (
'home', 1, 3, 5, '0.0.0.0' 'home', 1, 4, 6, '0.0.0.0'
); );
INSERT INTO child_configs ( INSERT INTO child_configs (
testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/ipsec.d/data.sql
+17 -6
View File
@@ -8,10 +8,15 @@ INSERT INTO identities (
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */ ) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def' 11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def'
); );
INSERT INTO identities (
type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
11, X'ae096b87b44886d3b820978623dabd0eae22ebbc'
);
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* [email protected] */ ) VALUES ( /* [email protected] */
@@ -20,7 +25,7 @@ INSERT INTO identities (
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, [email protected]' */ ) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, [email protected]' */
11, X'ee7f38daeea1b81a41777f78f2674be8439d8e0e' 11, X'ee7f38daeea1b81a41777f78f2674be8439d8e0e'
); );
@@ -59,7 +64,7 @@ INSERT INTO certificate_identity (
INSERT INTO certificate_identity ( INSERT INTO certificate_identity (
certificate, identity certificate, identity
) VALUES ( ) VALUES (
2, 3 1, 3
); );
INSERT INTO certificate_identity ( INSERT INTO certificate_identity (
@@ -68,6 +73,12 @@ INSERT INTO certificate_identity (
2, 4 2, 4
); );
INSERT INTO certificate_identity (
certificate, identity
) VALUES (
2, 5
);
/* Private Keys */ /* Private Keys */
INSERT INTO private_keys ( INSERT INTO private_keys (
@@ -79,13 +90,13 @@ INSERT INTO private_keys (
INSERT INTO private_key_identity ( INSERT INTO private_key_identity (
private_key, identity private_key, identity
) VALUES ( ) VALUES (
1, 3 1, 4
); );
INSERT INTO private_key_identity ( INSERT INTO private_key_identity (
private_key, identity private_key, identity
) VALUES ( ) VALUES (
1, 4 1, 5
); );
/* Configurations */ /* Configurations */
@@ -99,7 +110,7 @@ INSERT INTO ike_configs (
INSERT INTO peer_configs ( INSERT INTO peer_configs (
name, ike_cfg, local_id, remote_id, virtual name, ike_cfg, local_id, remote_id, virtual
) VALUES ( ) VALUES (
'home', 1, 3, 5, '0.0.0.0' 'home', 1, 4, 6, '0.0.0.0'
); );
INSERT INTO child_configs ( INSERT INTO child_configs (
testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/ipsec.d/data.sql
+22 -13
View File
@@ -8,10 +8,16 @@ INSERT INTO identities (
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */ ) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def' 11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def'
); );
INSERT INTO identities (
type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
11, X'ae096b87b44886d3b820978623dabd0eae22ebbc'
);
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* moon.strongswan.org */ ) VALUES ( /* moon.strongswan.org */
@@ -20,7 +26,7 @@ INSERT INTO identities (
INSERT INTO identities ( INSERT INTO identities (
type, data type, data
) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' */ ) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' */
11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e' 11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
); );
@@ -71,7 +77,7 @@ INSERT INTO certificate_identity (
INSERT INTO certificate_identity ( INSERT INTO certificate_identity (
certificate, identity certificate, identity
) VALUES ( ) VALUES (
2, 3 1, 3
); );
INSERT INTO certificate_identity ( INSERT INTO certificate_identity (
@@ -80,6 +86,12 @@ INSERT INTO certificate_identity (
2, 4 2, 4
); );
INSERT INTO certificate_identity (
certificate, identity
) VALUES (
2, 5
);
/* Private Keys */ /* Private Keys */
INSERT INTO private_keys ( INSERT INTO private_keys (
@@ -91,13 +103,13 @@ INSERT INTO private_keys (
INSERT INTO private_key_identity ( INSERT INTO private_key_identity (
private_key, identity private_key, identity
) VALUES ( ) VALUES (
1, 3 1, 4
); );
INSERT INTO private_key_identity ( INSERT INTO private_key_identity (
private_key, identity private_key, identity
) VALUES ( ) VALUES (
1, 4 1, 5
); );
/* Configurations */ /* Configurations */
@@ -111,7 +123,7 @@ INSERT INTO ike_configs (
INSERT INTO peer_configs ( INSERT INTO peer_configs (
name, ike_cfg, local_id, remote_id, pool name, ike_cfg, local_id, remote_id, pool
) VALUES ( ) VALUES (
'rw', 1, 3, 5, 'pool0,pool1' 'rw', 1, 4, 6, 'pool0,pool1'
); );
INSERT INTO child_configs ( INSERT INTO child_configs (
@@ -167,7 +179,7 @@ INSERT INTO pools (
INSERT INTO addresses ( INSERT INTO addresses (
pool, address, identity, acquired, released pool, address, identity, acquired, released
) VALUES ( ) VALUES (
1, X'0a030001', 6, 1247817255, 1247817277 1, X'0a030001', 7, 1247817255, 1247817277
); );
INSERT INTO addresses ( INSERT INTO addresses (
@@ -179,7 +191,7 @@ INSERT INTO addresses (
INSERT INTO addresses ( INSERT INTO addresses (
pool, address, identity, acquired, released pool, address, identity, acquired, released
) VALUES ( ) VALUES (
2, X'0a030101', 7, 1247817257, 1247817278 2, X'0a030101', 8, 1247817257, 1247817278
); );
INSERT INTO addresses ( INSERT INTO addresses (
@@ -191,14 +203,11 @@ INSERT INTO addresses (
INSERT INTO leases ( INSERT INTO leases (
address, identity, acquired, released address, identity, acquired, released
) VALUES ( ) VALUES (
1, 6, 1247817255, 1247817277 1, 7, 1247817255, 1247817277
); );
INSERT INTO leases ( INSERT INTO leases (
address, identity, acquired, released address, identity, acquired, released
) VALUES ( ) VALUES (
3, 7, 1247817257, 1247817278 3, 8, 1247817257, 1247817278
); );