From 8a1c319436297de44252fb1f9a88fd3572607734 Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Fri, 3 Mar 2017 15:02:35 +0900 Subject: [PATCH] Add the modified ipsec configuration value Change-Id: I6c9621f4d4603f46bb1f64bb0229338060b1f466 --- test/vpn_test.c | 94 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 30 deletions(-) diff --git a/test/vpn_test.c b/test/vpn_test.c index 0cf47b0..43780ac 100755 --- a/test/vpn_test.c +++ b/test/vpn_test.c @@ -106,33 +106,57 @@ typedef struct { typedef enum { IPSEC_VERSION, - IPSEC_LOCAL_ADDRS, - IPSEC_REMOTE_ADDRS, + IPSEC_LEFT_ADDRS, + IPSEC_RIGHT_ADDRS, IPSEC_LOCAL_AUTH, IPSEC_LOCAL_CERTS, IPSEC_LOCAL_ID, IPSEC_LOCAL_XAUTH_ID, + IPSEC_LOCAL_XAUTH_AUTH, + IPSEC_LOCAL_XAUTH_XAUTH_ID, IPSEC_REMOTE_AUTH, IPSEC_REMOTE_CERTS, - IPSEC_REMOTE_TS, - IPSEC_XAUTH_SECRET, - IPSEC_IKE_SECRET, + IPSEC_REMOTE_ID, + IPSEC_REMOTE_XAUTH_ID, + IPSEC_REMOTE_XAUTH_AUTH, + IPSEC_REMOTE_XAUTH_XAUTH_ID, + IPSEC_CHILDREN_LOCAL_TS, + IPSEC_CHILDREN_REMOTE_TS, + IPSEC_IKE_DATA, + IPSEC_IKE_OWNERS, + IPSEC_XAUTH_DATA, + IPSEC_XAUTH_OWNERS, + IPSEC_CERT_TYPE, + IPSEC_CERT_FLAG, + IPSEC_CERT_DATA, IPSEC_KVS_MAX, } ipsec_kv_e; kv_s ipsec_setting_kvs[] = { {"IPsec.Version", NULL}, - {"IPsec.LocalAddrs", NULL}, - {"IPsec.RemoteAddrs", NULL}, + {"IPsec.LeftAddrs", NULL}, + {"IPsec.RightAddrs", NULL}, {"IPsec.LocalAuth", NULL}, {"IPsec.LocalCerts", NULL}, {"IPsec.LocalID", NULL}, {"IPsec.LocalXauthID", NULL}, + {"IPsec.LocalXauthAuth", NULL}, + {"IPsec.LocalXauthXauthID", NULL}, {"IPsec.RemoteAuth", NULL}, {"IPsec.RemoteCerts", NULL}, - {"IPsec.RemoteTS", NULL}, - {"IPsec.XauthSecret", NULL}, - {"IPsec.IKESecret", NULL}, + {"IPsec.RemoteID", NULL}, + {"IPsec.RemoteXauthID", NULL}, + {"IPsec.RemoteXauthAuth", NULL}, + {"IPsec.RemoteXauthXauthID", NULL}, + {"IPsec.ChildrenLocalTS", NULL}, + {"IPsec.ChildrenRemoteTS", NULL}, + {"IPsec.IKEData", NULL}, + {"IPsec.IKEOwners", NULL}, + {"IPsec.XauthData", NULL}, + {"IPsec.XautOwners", NULL}, + {"IPsec.CertType", NULL}, + {"IPsec.CertFlag", NULL}, + {"IPsec.CertData", NULL}, {NULL, NULL}, }; @@ -531,14 +555,14 @@ static void __gen_ipsec_hybrid_rsa_kvs(void) __init_ipsec_setting_kvs(); ipsec_setting_kvs[IPSEC_VERSION].value = g_strdup("1"); - ipsec_setting_kvs[IPSEC_LOCAL_ADDRS].value = __get_user_input("Local Address for IPsec"); - ipsec_setting_kvs[IPSEC_REMOTE_ADDRS].value = __get_user_input("Remote Address for IPsec"); + ipsec_setting_kvs[IPSEC_LEFT_ADDRS].value = __get_user_input("Local Address for IPsec"); + ipsec_setting_kvs[IPSEC_RIGHT_ADDRS].value = __get_user_input("Remote Address for IPsec"); ipsec_setting_kvs[IPSEC_LOCAL_AUTH].value = g_strdup("xauth"); - ipsec_setting_kvs[IPSEC_LOCAL_CERTS].value = __get_user_input("File path for local cert"); ipsec_setting_kvs[IPSEC_LOCAL_XAUTH_ID].value = g_strdup("dave"); ipsec_setting_kvs[IPSEC_REMOTE_AUTH].value = g_strdup("pubkey"); ipsec_setting_kvs[IPSEC_REMOTE_CERTS].value = __get_user_input("File path for remote cert"); - ipsec_setting_kvs[IPSEC_XAUTH_SECRET].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_XAUTH_DATA].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_XAUTH_OWNERS].value = g_strdup("dave"); return; } @@ -547,13 +571,15 @@ static void __gen_ipsec_xauth_psk_kvs(void) __init_ipsec_setting_kvs(); ipsec_setting_kvs[IPSEC_VERSION].value = g_strdup("1"); - ipsec_setting_kvs[IPSEC_LOCAL_ADDRS].value = __get_user_input("Local Address for IPsec"); - ipsec_setting_kvs[IPSEC_REMOTE_ADDRS].value = __get_user_input("Remote Address for IPsec"); - ipsec_setting_kvs[IPSEC_LOCAL_AUTH].value = g_strdup("xauth"); - ipsec_setting_kvs[IPSEC_LOCAL_XAUTH_ID].value = g_strdup("dave"); + ipsec_setting_kvs[IPSEC_LEFT_ADDRS].value = __get_user_input("Local Address for IPsec"); + ipsec_setting_kvs[IPSEC_RIGHT_ADDRS].value = __get_user_input("Remote Address for IPsec"); + ipsec_setting_kvs[IPSEC_LOCAL_AUTH].value = g_strdup("psk"); + ipsec_setting_kvs[IPSEC_LOCAL_XAUTH_AUTH].value = g_strdup("xauth"); + ipsec_setting_kvs[IPSEC_LOCAL_XAUTH_XAUTH_ID].value = g_strdup("dave"); ipsec_setting_kvs[IPSEC_REMOTE_AUTH].value = g_strdup("psk"); - ipsec_setting_kvs[IPSEC_XAUTH_SECRET].value = g_strdup("ABCDEFGH"); - ipsec_setting_kvs[IPSEC_IKE_SECRET].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_IKE_DATA].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_XAUTH_DATA].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_XAUTH_OWNERS].value = g_strdup("dave"); return; } static void __gen_ipsec_xauth_rsa_kvs(void) @@ -561,14 +587,19 @@ static void __gen_ipsec_xauth_rsa_kvs(void) __init_ipsec_setting_kvs(); ipsec_setting_kvs[IPSEC_VERSION].value = g_strdup("1"); - ipsec_setting_kvs[IPSEC_LOCAL_ADDRS].value = __get_user_input("Local Address for IPsec"); - ipsec_setting_kvs[IPSEC_REMOTE_ADDRS].value = __get_user_input("Remote Address for IPsec"); - ipsec_setting_kvs[IPSEC_LOCAL_AUTH].value = g_strdup("xauth"); + ipsec_setting_kvs[IPSEC_LEFT_ADDRS].value = __get_user_input("Local Address for IPsec"); + ipsec_setting_kvs[IPSEC_RIGHT_ADDRS].value = __get_user_input("Remote Address for IPsec"); + ipsec_setting_kvs[IPSEC_LOCAL_AUTH].value = g_strdup("pubkey"); ipsec_setting_kvs[IPSEC_LOCAL_CERTS].value = __get_user_input("File path for local cert"); - ipsec_setting_kvs[IPSEC_LOCAL_XAUTH_ID].value = g_strdup("dave"); + ipsec_setting_kvs[IPSEC_LOCAL_XAUTH_AUTH].value = g_strdup("xauth"); + ipsec_setting_kvs[IPSEC_LOCAL_XAUTH_XAUTH_ID].value = g_strdup("dave"); ipsec_setting_kvs[IPSEC_REMOTE_AUTH].value = g_strdup("pubkey"); ipsec_setting_kvs[IPSEC_REMOTE_CERTS].value = __get_user_input("File path for remote cert"); - ipsec_setting_kvs[IPSEC_XAUTH_SECRET].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_XAUTH_DATA].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_XAUTH_OWNERS].value = g_strdup("dave"); + ipsec_setting_kvs[IPSEC_CERT_TYPE].value = g_strdup("X509"); + ipsec_setting_kvs[IPSEC_CERT_FLAG].value = g_strdup("CA"); + ipsec_setting_kvs[IPSEC_CERT_DATA].value = __get_user_input("File path for CA cert"); return; } static void __gen_ipsec_ikev2_psk_kvs(void) @@ -576,11 +607,11 @@ static void __gen_ipsec_ikev2_psk_kvs(void) __init_ipsec_setting_kvs(); ipsec_setting_kvs[IPSEC_VERSION].value = g_strdup("2"); - ipsec_setting_kvs[IPSEC_LOCAL_ADDRS].value = __get_user_input("Local Address for IPsec"); - ipsec_setting_kvs[IPSEC_REMOTE_ADDRS].value = __get_user_input("Remote Address for IPsec"); + ipsec_setting_kvs[IPSEC_LEFT_ADDRS].value = __get_user_input("Local Address for IPsec"); + ipsec_setting_kvs[IPSEC_RIGHT_ADDRS].value = __get_user_input("Remote Address for IPsec"); ipsec_setting_kvs[IPSEC_LOCAL_AUTH].value = g_strdup("psk"); ipsec_setting_kvs[IPSEC_REMOTE_AUTH].value = g_strdup("psk"); - ipsec_setting_kvs[IPSEC_IKE_SECRET].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_IKE_DATA].value = g_strdup("ABCDEFGH"); return; } static void __gen_ipsec_ikev2_rsa_kvs() @@ -588,12 +619,15 @@ static void __gen_ipsec_ikev2_rsa_kvs() __init_ipsec_setting_kvs(); ipsec_setting_kvs[IPSEC_VERSION].value = g_strdup("2"); - ipsec_setting_kvs[IPSEC_LOCAL_ADDRS].value = __get_user_input("Local Address for IPsec"); - ipsec_setting_kvs[IPSEC_REMOTE_ADDRS].value = __get_user_input("Remote Address for IPsec"); + ipsec_setting_kvs[IPSEC_LEFT_ADDRS].value = __get_user_input("Local Address for IPsec"); + ipsec_setting_kvs[IPSEC_RIGHT_ADDRS].value = __get_user_input("Remote Address for IPsec"); ipsec_setting_kvs[IPSEC_LOCAL_AUTH].value = g_strdup("pubkey"); ipsec_setting_kvs[IPSEC_LOCAL_CERTS].value = __get_user_input("File path for local cert"); ipsec_setting_kvs[IPSEC_REMOTE_AUTH].value = g_strdup("pubkey"); ipsec_setting_kvs[IPSEC_REMOTE_CERTS].value = __get_user_input("File path for remote cert"); + ipsec_setting_kvs[IPSEC_CERT_TYPE].value = g_strdup("X509"); + ipsec_setting_kvs[IPSEC_CERT_FLAG].value = g_strdup("CA"); + ipsec_setting_kvs[IPSEC_CERT_DATA].value = __get_user_input("File path for CA cert"); return; } -- 2.34.1