Imported Upstream version 5.1.1

5 files changed, 329 insertions, 38 deletions

diff --git a/testing/hosts/default/etc/hosts b/testing/hosts/default/etc/hosts
index 0931f450e..75a8fdd2a 100644
--- a/testing/hosts/default/etc/hosts
+++ b/testing/hosts/default/etc/hosts
@@ -12,7 +12,7 @@
 10.1.0.254	uml1.strongswan.org	uml1
 10.2.0.254	uml1.strongswan.org	uml2
 
-10.1.0.10	alice.strongswan.org	alice
+10.1.0.10	alice.strongswan.org	alice aaa.strongswan.org
 10.1.0.20	venus.strongswan.org	venus
 10.1.0.30	carol2.strongswan.org	carol2
 10.1.0.40	dave2.strongswan.org	dave2
diff --git a/testing/hosts/default/etc/iptables.rules b/testing/hosts/default/etc/iptables.rules
index c3f036cf9..b69e1429e 100644
--- a/testing/hosts/default/etc/iptables.rules
+++ b/testing/hosts/default/etc/iptables.rules
@@ -9,6 +9,10 @@
 -A INPUT  -i eth0 -p 50 -j ACCEPT
 -A OUTPUT -o eth0 -p 50 -j ACCEPT
 
+# allow ah
+-A INPUT  -i eth0 -p 51 -j ACCEPT
+-A OUTPUT -o eth0 -p 51 -j ACCEPT
+
 # allow IKE
 -A INPUT  -i eth0 -p udp --sport 500 --dport 500 -j ACCEPT
 -A OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
diff --git a/testing/hosts/default/etc/pts/data.sql b/testing/hosts/default/etc/pts/data.sql
index 35fd65753..241a99645 100644
--- a/testing/hosts/default/etc/pts/data.sql
+++ b/testing/hosts/default/etc/pts/data.sql
@@ -132,6 +132,42 @@ INSERT INTO products (			/* 22 */
  'Android 4.2.1'
 );
 
+INSERT INTO products (			/* 23 */
+  name
+) VALUES (
+ 'Ubuntu 13.10 i686'
+);
+
+INSERT INTO products (			/* 24 */
+  name
+) VALUES (
+ 'Ubuntu 13.10 x86_64'
+);
+
+INSERT INTO products (			/* 25 */
+  name
+) VALUES (
+ 'Debian 7.1 i686'
+);
+
+INSERT INTO products (			/* 26 */
+  name
+) VALUES (
+ 'Debian 7.1 x86_64'
+);
+
+INSERT INTO products (			/* 27 */
+  name
+) VALUES (
+ 'Debian 7.2 i686'
+);
+
+INSERT INTO products (			/* 28 */
+  name
+) VALUES (
+ 'Debian 7.2 x86_64'
+);
+
 /* Directories */
 
 INSERT INTO directories (		/*  1 */
@@ -287,109 +323,109 @@ INSERT INTO algorithms (
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 2, 32768, X'6c6f8e12f6cbfba612e780374c4cdcd40f20968a' 
+  28, 2, 32768, X'6c6f8e12f6cbfba612e780374c4cdcd40f20968a'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 2, 16384, X'dbcecd19d59310183cf5c31ddee29e8d7bec64d3f9583aad074330a1b3024b07' 
+  28, 2, 16384, X'dbcecd19d59310183cf5c31ddee29e8d7bec64d3f9583aad074330a1b3024b07'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 2, 8192, X'197c5385e5853003188833d4f991136c1b0875fa416a60b1159f64e57e457b3184762c884a802a2bda194c058e3bd953' 
+  28, 2, 8192, X'197c5385e5853003188833d4f991136c1b0875fa416a60b1159f64e57e457b3184762c884a802a2bda194c058e3bd953'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 4, 32768, X'3ad204f99eb7262efab79cfca02628870ea76361' 
+  28, 4, 32768, X'3ad204f99eb7262efab79cfca02628870ea76361'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 4, 16384, X'3a2170aad92fdd58b55e0e199822bc873cf587b2d1eb1ed7ed8dcea97ae86376' 
+  28, 4, 16384, X'3a2170aad92fdd58b55e0e199822bc873cf587b2d1eb1ed7ed8dcea97ae86376'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 4, 8192, X'f778076baa876b5e4b502494a3db081fb09dd870dee6991d54104a74b7e009c58fe261db5ffd13c11e08ef0cefcfa59f' 
+  28, 4, 8192, X'f778076baa876b5e4b502494a3db081fb09dd870dee6991d54104a74b7e009c58fe261db5ffd13c11e08ef0cefcfa59f'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 5, 32768, X'ecd9c7076cc0572724c7a67db7f19c2831e0445f' 
+  28, 5, 32768, X'ecd9c7076cc0572724c7a67db7f19c2831e0445f'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 5, 16384, X'28f3ea5afd34444c8232ea75003131e294a0c9b847de300e4b205d38c1a41305' 
+  28, 5, 16384, X'28f3ea5afd34444c8232ea75003131e294a0c9b847de300e4b205d38c1a41305'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  4, 5, 8192, X'51921a8b9322f2d3f06d55002ff40a79da67e70cb563b2a50977642d603dfac2ccbb68b3d32a8bb350769b75d6254208' 
+  28, 5, 8192, X'51921a8b9322f2d3f06d55002ff40a79da67e70cb563b2a50977642d603dfac2ccbb68b3d32a8bb350769b75d6254208'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 1, 32768, X'd9309b9e45928239d7a7b18711e690792632cce4' 
+  18, 1, 32768, X'd9309b9e45928239d7a7b18711e690792632cce4'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 1, 16384, X'dbfa1856d278d8707c4989b30dd065b4bcd309908f0f2e6e66ff2aa83ff93f59' 
+  18, 1, 16384, X'dbfa1856d278d8707c4989b30dd065b4bcd309908f0f2e6e66ff2aa83ff93f59'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 1, 8192, X'fb8d027f03bb5ebb47741ed247eb9e174127b714d20229885feb37e0979aeb14a1b74020cded891d680441093625729c' 
+  18, 1, 8192, X'fb8d027f03bb5ebb47741ed247eb9e174127b714d20229885feb37e0979aeb14a1b74020cded891d680441093625729c'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 3, 32768, X'3715f2f94016a91fab5bbc503f0f1d43c5a9fc2b' 
+  18, 3, 32768, X'3715f2f94016a91fab5bbc503f0f1d43c5a9fc2b'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 3, 16384, X'c03a5296b5decb87b01517f9927a8b2349dfb29ff9f5ba084f994c155ca5d4be' 
+  18, 3, 16384, X'c03a5296b5decb87b01517f9927a8b2349dfb29ff9f5ba084f994c155ca5d4be'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 3, 8192, X'b8bc345f56115235cc6091f61e312ce43ea54a5b99e7295002ae7b415fd35e06ec4c731ab70ad00d784bb53a318a2fa0' 
+  18, 3, 8192, X'b8bc345f56115235cc6091f61e312ce43ea54a5b99e7295002ae7b415fd35e06ec4c731ab70ad00d784bb53a318a2fa0'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 5, 32768, X'e59602f4edf24c1b36199588886d06665d4adcd7' 
+  18, 5, 32768, X'e59602f4edf24c1b36199588886d06665d4adcd7'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 5, 16384, X'090e1b77bda7fe665e498c6b5e09dbb7ddc5cfe57f213de48f4fb6736484f500' 
+  18, 5, 16384, X'090e1b77bda7fe665e498c6b5e09dbb7ddc5cfe57f213de48f4fb6736484f500'
 );
 
 INSERT INTO file_hashes (
   product, file, algo, hash
 ) VALUES (
-  18, 5, 8192, X'7cbdb4612a13443dba910ecdef5161f2213e52c9b4a2eef14bcee5d287e9df931cd022e9e9715518ad9c9b6e3384a668' 
+  18, 5, 8192, X'7cbdb4612a13443dba910ecdef5161f2213e52c9b4a2eef14bcee5d287e9df931cd022e9e9715518ad9c9b6e3384a668'
 );
 
 /* Packages */
@@ -423,25 +459,25 @@ INSERT INTO packages (			/*  4 */
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  1, 4, '1.0.1e-2', 1366531494
+  1, 28, '1.0.1e-2', 1366531494
 );
 
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  2, 4, '1.0.1e-2', 1366531494
+  2, 28, '1.0.1e-2', 1366531494
 );
 
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  3, 4, '1.0.1e-2', 1366531494
+  3, 28, '1.0.1e-2', 1366531494
 );
 
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  4, 4, '1.0.1e-2', 1366531494
+  4, 28, '1.0.1e-2', 1366531494
 );
 
 /* Components */
@@ -555,6 +591,18 @@ INSERT INTO groups_product_defaults (
 INSERT INTO groups_product_defaults (
   group_id, product_id
 ) VALUES (
+  4, 25
+);
+
+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
+  4, 27
+);
+
+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
   5, 2
 );
 
@@ -573,7 +621,13 @@ INSERT INTO groups_product_defaults (
 INSERT INTO groups_product_defaults (
   group_id, product_id
 ) VALUES (
-  6, 7
+  5, 26
+);
+
+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
+  5, 28
 );
 
 INSERT INTO groups_product_defaults (
@@ -615,6 +669,12 @@ INSERT INTO groups_product_defaults (
 INSERT INTO groups_product_defaults (
   group_id, product_id
 ) VALUES (
+  6, 23
+);
+
+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
   7, 8
 );
 
@@ -657,6 +717,12 @@ INSERT INTO groups_product_defaults (
 INSERT INTO groups_product_defaults (
   group_id, product_id
 ) VALUES (
+  7, 24
+);
+
+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
   3, 21
 );
 
@@ -758,89 +824,237 @@ INSERT INTO policies (			/* 15 */
   8, 'Get /system/lib', 14, 0, 0
 );
 
+INSERT INTO policies (          /* 16 */
+  type, name, dir, rec_fail, rec_noresult
+) VALUES (
+  9, 'Measure /bin', 1, 2, 2
+);
+
+INSERT INTO policies (			/* 17 */
+  type, name, argument, rec_fail, rec_noresult
+) VALUES (
+  15, 'SWID Tag IDs', 'R', 2, 2
+);
+
+INSERT INTO policies (			/* 18 */
+  type, name, argument, rec_fail, rec_noresult
+) VALUES (
+  15, 'SWID Tags', '', 2, 2
+);
+
 /* Enforcements */
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  1 */
   policy, group_id, max_age
 ) VALUES (
   1, 1, 86400
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  2 */
   policy, group_id, max_age
 ) VALUES (
   2, 3, 0
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  3 */
   policy, group_id, max_age
 ) VALUES (
   3, 2, 0
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  4 */
   policy, group_id, max_age
 ) VALUES (
   5, 7, 86400
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  5 */
   policy, group_id, max_age
 ) VALUES (
   6, 7, 86400
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  6 */
   policy, group_id, max_age
 ) VALUES (
   7, 2, 86400
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  7 */
   policy, group_id, max_age
 ) VALUES (
   8, 1, 60
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  8 */
   policy, group_id, max_age
 ) VALUES (
   9, 1, 60
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/*  9 */
   policy, group_id, max_age
 ) VALUES (
   10, 2, 60
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/* 10 */
   policy, group_id, max_age
 ) VALUES (
   11, 10, 86400
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/* 11 */
   policy, group_id, max_age
 ) VALUES (
   12, 5, 86400
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/* 12 */
   policy, group_id, max_age
 ) VALUES (
   13, 5, 86400
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/* 13 */
   policy, group_id, max_age
 ) VALUES (
   14, 9, 0
 );
 
-INSERT INTO enforcements (
+INSERT INTO enforcements (		/* 14 */
   policy, group_id, max_age
 ) VALUES (
   15, 9, 0
 );
 
+/* regids */
+
+INSERT INTO regids (			/*  1 */
+  name
+) VALUES (
+ 'regid.1986-12.com.adobe'
+);
+
+INSERT INTO regids (			/*  2 */
+  name
+) VALUES (
+ 'regid.1991-06.com.microsoft'
+);
+
+INSERT INTO regids (			/*  3 */
+  name
+) VALUES (
+ 'regid.2004-05.com.ubuntu'
+);
+
+INSERT INTO regids (			/*  4 */
+  name
+) VALUES (
+ 'regid.1995-04.org.apache'
+);
+
+INSERT INTO regids (			/*  5 */
+  name
+) VALUES (
+ 'regid.1999-03.org.debian'
+);
+
+INSERT INTO regids (			/*  6 */
+  name
+) VALUES (
+ 'regid.1994-04.org.isc'
+);
+
+INSERT INTO regids (			/*  7 */
+  name
+) VALUES (
+ 'regid.1998-12.org.openssl'
+);
+
+INSERT INTO regids (			/*  8 */
+  name
+) VALUES (
+ 'regid.1998-01.org.samba'
+);
+
+INSERT INTO regids (			/*  9 */
+  name
+) VALUES (
+ 'regid.2002-08.org.sqlite'
+);
+
+INSERT INTO regids (			/* 10 */
+  name
+) VALUES (
+ 'regid.2004-03.org.strongswan'
+);
+
+/* Tags */
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  2, 'Windows-8-Pro'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'apache-2-2-22-13'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'bind-9-8-4-dfsg'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'libsqlite-3-7-13-1'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'libssl-1-0-1e-2'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'libssl-dev-1-0-1e-2'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'libssl-doc-1-0-1e-2'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'openssl-1-0-1e-2'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'smbclient-3-6-6-6'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  5, 'sqlite-3-7-13-1'
+);
+
+INSERT INTO tags (
+  regid, unique_sw_id
+) VALUES (
+  10, 'strongSwan-5-1-1'
+);
+
diff --git a/testing/hosts/default/etc/pts/tables.sql b/testing/hosts/default/etc/pts/tables.sql
index 4cc959e09..a0f3a4e8d 100644
--- a/testing/hosts/default/etc/pts/tables.sql
+++ b/testing/hosts/default/etc/pts/tables.sql
@@ -232,3 +232,25 @@ CREATE TABLE identities (
   UNIQUE (type, value)
 );
 
+DROP TABLE IF EXISTS regids;
+CREATE TABLE regids (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  name TEXT NOT NULL
+);
+DROP INDEX IF EXISTS regids_name;
+CREATE INDEX regids_name ON regids (
+  name
+);
+
+DROP TABLE IF EXISTS tags;
+CREATE TABLE tags (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  regid INTEGER NOT NULL REFERENCES regids(id),
+  unique_sw_id TEXT NOT NULL,
+  value TEXT
+);
+DROP INDEX IF EXISTS tags_name;
+CREATE INDEX tags_unique_sw_id ON tags (
+  unique_sw_id
+);
+
diff --git a/testing/hosts/winnetou/etc/bind/db.strongswan.org b/testing/hosts/winnetou/etc/bind/db.strongswan.org
index dfd2705cb..694e2cee1 100644
--- a/testing/hosts/winnetou/etc/bind/db.strongswan.org
+++ b/testing/hosts/winnetou/etc/bind/db.strongswan.org
@@ -31,6 +31,57 @@ crl		IN	CNAME	winnetou.strongswan.org.
 ldap		IN	CNAME	winnetou.strongswan.org.
 ocsp		IN	CNAME	winnetou.strongswan.org.
 ;
+moon		IN	CERT	( 1 0 0
+				MIIEIjCCAwqgAwIBAgIBFzANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ
+				MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS
+				b290IENBMB4XDTA5MDgyNzEwMDMzMloXDTE0MDgyNjEwMDMzMlowRjELMAkGA1UE
+				BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xHDAaBgNVBAMTE21vb24u
+				c3Ryb25nc3dhbi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDK
+				L2M91Lu6BYYhWxWgMS9z9TMSTwszm5rhO7ZIsCtMRo4PAeYw+++SGXt3CPXb/+p+
+				SWKGlm11rPE71eQ3ehgh2C3hAurfmWO0iQQaCw+fdreeIVCqOQIOP6UqZ327h5yY
+				YpHk8VQv4vBJTpxclU1PqnWheqe1ZlLxsW773LRml/fQt/UgvJkCBTZZONLNMfK+
+				7TDnYaVsAtncgvDN78nUNEe2qY92KK7SrBJ6SpUEg49m51F+XgsGcsgWVHS85on3
+				Om/G48crLEVJjdu8CxewSRVgb+lPJWzHd8QsU0Vg/7vlqs3ZRMyNtNKrr4opSvVb
+				A6agGlTXhDCreDiXU8KHAgMBAAGjggEaMIIBFjAJBgNVHRMEAjAAMAsGA1UdDwQE
+				AwIDqDAdBgNVHQ4EFgQUapx00fiJeYn2WpTpifH6w2SdKS4wbQYDVR0jBGYwZIAU
+				XafdcAZRMn7ntm2zteXgYOouTe+hSaRHMEUxCzAJBgNVBAYTAkNIMRkwFwYDVQQK
+				ExBMaW51eCBzdHJvbmdTd2FuMRswGQYDVQQDExJzdHJvbmdTd2FuIFJvb3QgQ0GC
+				AQAwHgYDVR0RBBcwFYITbW9vbi5zdHJvbmdzd2FuLm9yZzATBgNVHSUEDDAKBggr
+				BgEFBQcDATA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLnN0cm9uZ3N3YW4u
+				b3JnL3N0cm9uZ3N3YW4uY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQCctXg2xeMozaTV
+				jiBL1P8MY9uEH5JtU0EceQ1RbI5/2vGRdnECND9oADY5vamaaE2Mdq2Qh/vlXnML
+				o3ii5ELjsQlYdTYZOcMOdcUUXYvbbFX1cwpkBhyBl1H25KptHcgQ/HnceKp3kOuq
+				wYOYjgwePXulcpWXx0E2QtQCFQQZFPyEWeNJxH0oglg53QPXfHY9I2/Gukj5V0bz
+				p7ME0Gs8KdnYdmbbDqzQgPsta96/m+HoJlsrVF+4Gqihj6BWMBQ2ybjPWZdG3oH9
+				25cE8v60Ry98D0Z/tygbAUFnh5oOvaf642paVgc3aoA77I8U+UZjECxISoiHultY
+				7QTufOwP
+				)
+sun		IN	CERT	( 1 0 0
+				MIIEIDCCAwigAwIBAgIBFjANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ
+				MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS
+				b290IENBMB4XDTA5MDgyNzA5NTkwNFoXDTE0MDgyNjA5NTkwNFowRTELMAkGA1UE
+				BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN1bi5z
+				dHJvbmdzd2FuLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+V
+				VIpn6Q5jaU//EN6p6A5cSfUfhBK0mFa2laFFZh/Y0h66AXqqrQ3X917h7YNsSk68
+				oowY9h9I3gOx7hNVBsJr2VjdYC+b0q5NTha09/A5mimv/prYj6o0yawxoPjoDs9Y
+				h7D7Kf+F8fkgk0stlHJZX66J7dNrFXbg1xBld+Ep5Or2FbEZ9QWUpRQTuhdpNt/4
+				9YuxQ59DemY9IRbwsrKCHH0mGrJsDdqeb0ap+8QvSXHjCt1fr9MNKWaAFAQLKQI4
+				e0da1ntPCEQLeE833+NNRBgGufk0KqGT3eAXqrxa9AEIUJnVcPexQdqUMjcUpXFb
+				8WNzRWB8Egh3BDK6FsECAwEAAaOCARkwggEVMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+				AgOoMB0GA1UdDgQWBBRW1p4v2qihzRlcI1PnxbZwluML+zBtBgNVHSMEZjBkgBRd
+				p91wBlEyfue2bbO15eBg6i5N76FJpEcwRTELMAkGA1UEBhMCQ0gxGTAXBgNVBAoT
+				EExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN0cm9uZ1N3YW4gUm9vdCBDQYIB
+				ADAdBgNVHREEFjAUghJzdW4uc3Ryb25nc3dhbi5vcmcwEwYDVR0lBAwwCgYIKwYB
+				BQUHAwEwOQYDVR0fBDIwMDAuoCygKoYoaHR0cDovL2NybC5zdHJvbmdzd2FuLm9y
+				Zy9zdHJvbmdzd2FuLmNybDANBgkqhkiG9w0BAQsFAAOCAQEAo37LYT9Awx0MK/nA
+				FZpPJqUr0Ey+O5Ukcsdx7nd00SlmpiQRY8KmuRXCBQnDEgdLstd3slQjT0pJEgWF
+				0pzxybnI6eOzYAhLfhart+X1hURiNGbXjggm2s4I5+K32bVIkNEqlsYnd/6F9oo5
+				ZNO0/eTTruLZfkNe/zchBGKe/Z7MacVwlYWWCbMtBV4K1d5dGcRRgpQ9WivDlmat
+				Nh9wlscDSgSGk3HJkbxnq695VN7zUbDWAUvWWhV5bIDjlAR/xyT9ApqIxiyVVRul
+				fYrE7U05Hbt6GgAroAKLp6qJup9+TxQAKSjKIwJ0hf7OuYyQ8TZtVHS7AOhm+T/5
+				G/jGGA==
+				)
+;
 moon		IN	IPSECKEY ( 10 1 2 192.168.0.1
 				AwEAAcovYz3Uu7oFhiFbFaAxL3P1MxJPCzObmuE7tkiwK0xGjg8B5jD7
 				75IZe3cI9dv/6n5JYoaWbXWs8TvV5Dd6GCHYLeEC6t+ZY7SJBBoLD592