merged multi-auth branch back into trunk

This commit is contained in:
Martin Willi
2009-04-14 10:34:24 +00:00
parent 6e5c8d9413
commit a44bb9345f
230 changed files with 6163 additions and 4193 deletions
@@ -24,18 +24,6 @@ INSERT INTO identities (
2, X'6d6f6f6e2e7374726f6e677377616e2e6f7267'
);
INSERT INTO identities (
type, data
) VALUES ( /* carol@strongswan.org as an EAP identity */
205, X'6361726f6c407374726f6e677377616e2e6f7267'
);
INSERT INTO identities (
type, data
) VALUES ( /* moon.strongswan.org as an EAP identity */
205, X'6d6f6f6e2e7374726f6e677377616e2e6f7267'
);
/* Certificates */
INSERT INTO certificates (
@@ -67,13 +55,13 @@ INSERT INTO shared_secrets (
INSERT INTO shared_secret_identity (
shared_secret, identity
) VALUES (
1, 5
1, 3
);
INSERT INTO shared_secret_identity (
shared_secret, identity
) VALUES (
1, 6
1, 4
);
/* Configurations */
@@ -32,14 +32,8 @@ INSERT INTO identities (
INSERT INTO identities (
type, data
) VALUES ( /* moon.strongswan.org as an EAP identity */
205, X'6d6f6f6e2e7374726f6e677377616e2e6f7267'
);
INSERT INTO identities (
type, data
) VALUES ( /* carol@strongswan.org as an EAP identity */
205, X'6361726f6c407374726f6e677377616e2e6f7267'
) VALUES ( /* carol@strongswan.org */
3, X'6361726f6c407374726f6e677377616e2e6f7267'
);
/* Certificates */
@@ -111,13 +105,13 @@ INSERT INTO shared_secrets (
INSERT INTO shared_secret_identity (
shared_secret, identity
) VALUES (
1, 6
1, 3
);
INSERT INTO shared_secret_identity (
shared_secret, identity
) VALUES (
1, 7
1, 6
);
/* Configurations */