Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 45 insertions, 0 deletions

diff --git a/test/config/80211_keys.tmpl b/test/config/80211_keys.tmpl
new file mode 100644
index 00000000..da825ac8
--- /dev/null
+++ b/test/config/80211_keys.tmpl
@@ -0,0 +1,12 @@
+# Keys needed for the decryption test suite
+"wep","1234567890"
+"wpa-pwd","Induction"
+"wpa-pwd","test0815"
+"wpa-pwd","12345678"
+"wpa-psk","a5001e18e0b3f792278825bc3abff72d7021d7c157b600470ef730e2490835d4"
+"wpa-psk","79258f6ceeecedd3482b92deaabdb675f09bcb4003ef5074f5ddb10a94ebe00a"
+"wpa-psk","23a9ee58c7810546ae3e7509fda9f97435778d689e53a54891c56d02f18ca162"
+"wpa-psk","ecbfe709d6151eaba6a4fd9cba94fbb570c1fc4c15506fad3185b4a0a0cfda9a"
+"wpa-psk","a4b0b2efa7f77d1006eccf1a814b62125c15fac5c137d9cdff8c75c43194268f"
+"wpa-psk","fc738f5b63ba93ebf0a45d42c5a0b1b5064649fa98f59bc062c2944de3780fe276088c95daaf672deb6780051aa13563"
+"msk","fc3fe399f0ab9eeb5b6e87b6e2b276d828e874de1773d4a925f5410d96565b22b1471711baffb8611b28d2a09cc1a6aaffbbfdf3cccf12db57f175c53bfe2b7b"
diff --git a/test/config/80211_keys.user_tk_tmpl b/test/config/80211_keys.user_tk_tmpl
new file mode 100644
index 00000000..f8f33613
--- /dev/null
+++ b/test/config/80211_keys.user_tk_tmpl
@@ -0,0 +1,12 @@
+# Keys needed for the 80211 user TK test cases in decryption test suite
+"tk","d0e57d224c1bb8806089d8c23154074c"
+"tk","6eaf63f4ad7997ced353723de3029f4d"
+"tk","fb42811bcb59b7845376246454fbdab7"
+"tk","4e30e8c019bea43ea5262b10853b818d"
+"tk","70cdbf2e5bc0ca22e53930818a5d80e4"
+"tk","4e6abbcf9dc0943936700b6825952218f58a47dfdf51dbb8ce9b02fd7d2d9e40"
+"tk","502085ca205e668f7e7c61cdf4f731336bb31e4f5b28ec91860174192e9b2190"
+"tk","755a9c1c9e605d5ff62849e4a17a935c"
+"tk","7ff30f7a8dd67950eaaf2f20a869a62d"
+"tk","b3dc2ff2d88d0d34c1ddc421cea17f304af3c46acbbe7b6d808b6ebf1b98ec38"
+"tk","a745ee2313f86515a155c4cb044bc148ae234b9c72707f772b69c2fede3e4016"
diff --git a/test/config/c1222_decryption_table.tmpl b/test/config/c1222_decryption_table.tmpl
new file mode 100644
index 00000000..4c070e10
--- /dev/null
+++ b/test/config/c1222_decryption_table.tmpl
@@ -0,0 +1,2 @@
+# This file is automatically generated, DO NOT MODIFY.
+"2",01020304050607080102030405060708
diff --git a/test/config/dtlsdecrypttablefile.tmpl b/test/config/dtlsdecrypttablefile.tmpl
new file mode 100644
index 00000000..869822e2
--- /dev/null
+++ b/test/config/dtlsdecrypttablefile.tmpl
@@ -0,0 +1 @@
+"127.0.0.1","4433","data","TEST_KEYS_DIRsnakeoil-rsa.key",""
diff --git a/test/config/esp_sa.tmpl b/test/config/esp_sa.tmpl
new file mode 100644
index 00000000..24fbb217
--- /dev/null
+++ b/test/config/esp_sa.tmpl
@@ -0,0 +1,2 @@
+"IPv4","192.168.0.1","192.168.0.100","0x070883c2","AES-CBC [RFC3602]","0x5de1a4c2c72662c9fda7a7c78cd25623","HMAC-SHA-1-96 [RFC2404]","0x51c9213c18232f8f26c70c4dee6e0e6d56e31e8a"
+"IPv4","192.168.0.100","192.168.0.1","0xc254fe64","AES-CBC [RFC3602]","0x88e1dad7140af03b8d4f3d734d21be4b","HMAC-SHA-1-96 [RFC2404]","0x3e00d517c1220d4b7d2950fcc02edd4b6023d278"
diff --git a/test/config/ikev1_decryption_table.tmpl b/test/config/ikev1_decryption_table.tmpl
new file mode 100644
index 00000000..e457d2c3
--- /dev/null
+++ b/test/config/ikev1_decryption_table.tmpl
@@ -0,0 +1,4 @@
+# This file is automatically generated, DO NOT MODIFY.
+fafaeb49382a763c,735be0cb62f82675c4f7bf8fbab9b56834ba76d6ab4fa240
+ab3e0f1f8bc3be8e,928392441e00ece5e8af3bc545416e86afa1291e7c013271514738b70ef25d22
+29f6006212625def,c26a81baec6070d289f0b4f13c2fb182e3d5406d11c29ebc2fc179502541325b
diff --git a/test/config/ikev2_decryption_table.tmpl b/test/config/ikev2_decryption_table.tmpl
new file mode 100644
index 00000000..674564e6
--- /dev/null
+++ b/test/config/ikev2_decryption_table.tmpl
@@ -0,0 +1,10 @@
+# This file is automatically generated, DO NOT MODIFY.
+1234567890123456,0987654321098765,,,"NULL [RFC2410]",,,"NONE [RFC4306]"
+19ab98963486359f,78f13157ccd3b3d8,2e0e194070fc658c2bfbfdbf8b956be4b2eaa33d02a43cca,219f3080e631774b8d5836d3a675b099b1e271c9bdcf6e15,"3DES [RFC2451]",c96f5bad08aebbff60509c7495f11c183818b916,e742ac415cdfdd709c9de92769a169e0a5224f79,"HMAC_SHA1_160 [RFC4595]"
+ea684d21597afd36,d9fe2ab22dac23ac,be83fe15f6a9976941870830fe26c014b863b3,79e0f4476861a76e64329e787b1c4ff38d732f,"AES-CCM-128 with 12 octet ICV [RFC5282]",,,"NONE [RFC4306]"
+a2926ae833c6f138,5464c57d0dc5e272,5daf82e6fd7e57d5fbf76cd5af73fd46035db0bc,68848f4a7602b20c7d033cc998b0c097032ac38a,"AES-CTR-128 [RFC5930]",,,"ANY 96-bits of Authentication [No Checking]"
+81f24c0acd8fa55c,192383172724c706,aaa06839eaf0959d486eeecda7a48b23080963b5fd7217928e8fbf58,92dc96ec87076caa84e26b3621c7c469427e2e4bcc1b962362a3dde3,"AES-CTR-192 [RFC5930]",65777be31ee2137f31cf23fa0ee834dfede11cc0adc9a84541026642c09df2bf96056a2036e97a67ce7d3c5b6f37e17e8fe64f4ef23e14f5997fb7671df3adaf,42abd4709f1b94fd8c2270c74aae3fbe61c0b9c109c55f3e3b9ed7e480bc75c3985c15234caa623c8ca0606c303921d7cfd44861df1e798370b2ee95fe712e52,"HMAC_SHA2_512_256 [RFC4868]"
+191ccd371a7a1f7b,bc123d15e4af593f,9096ddd2933620e8f48122c53a3f562cb0222c1cf97ce41fcc874ea2582a89ac,6718c6b2bbef2f234eac4c13832f885d87b574afd2af0111161e99b5dc61b4d4,"AES-CBC-256 [RFC3602]",12d532c3e83c757906af548dfe1ccf223ca5507af77898454e2d55c8ace57a17,30c4ead18c93024b58a86c1e3db60f550221801026853170b4cb0248d3a95329,"HMAC_SHA2_256_128 [RFC4868]"
+cd7ae76304b277e2,74f6080ed799d463,daa0a85a81e6adda7b8c568f1c4cfaa6e9f9edb242e9895f012caaa642eacf4d004903,e02281ba4bb8ed20321faff956b95ce7f841b3039984dad4ed4625e77743fce4a04f32,"AES-CCM-256 with 16 octet ICV [RFC5282]",,,"NONE [RFC4306]"
+5d48bfeeb7d574da,bbb73016c0503640,91b817d036d97db3ace64475cd8d1cbeab186295020211a9cf0c16cec10b92b453ecd24e,d04516586721974d970627d85f7d031433b6558c0ec6faecf9217e5445e17e7eeee6bc68,"AES-GCM-256 with 8 octet ICV [RFC5282]",,,"NONE [RFC4306]"
+0158b8fb90b7623d,13514610cea16160,647075bf167447a1c8683e8dbe4794b4cfe73799cc6bec34905441159ce13705c8dfb3a9,15c9eae6f94631d63068bf44bb69999abc07b3d15e915fd8f0ed99ad481efd75deb02a5e,"AES-GCM-256 with 16 octet ICV [RFC5282]",,,"NONE [RFC4306]"
diff --git a/test/config/ssl_keys.tmpl b/test/config/ssl_keys.tmpl
new file mode 100644
index 00000000..8daa5cb7
--- /dev/null
+++ b/test/config/ssl_keys.tmpl
@@ -0,0 +1,2 @@
+"127.0.0.1","443","http","TEST_KEYS_DIRrsasnakeoil2.key",""
+"127.0.0.1","9131","http","TEST_KEYS_DIRkey.p12","WebAS"