From 4081ffc4fe1a7d2709a807e01043848f07217e52 Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Mon, 20 Mar 2017 16:58:51 +0900 Subject: [PATCH] Add private key data for ipsec vpn test Change-Id: I3df0c393868027afc0e458f53a3c335bd9b575a9 Signed-off-by: Yu jiung --- test/vpn_test.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/test/vpn_test.c b/test/vpn_test.c index 2a64809..97a4828 100755 --- a/test/vpn_test.c +++ b/test/vpn_test.c @@ -110,12 +110,14 @@ typedef enum { IPSEC_RIGHT_ADDRS, IPSEC_LOCAL_AUTH, IPSEC_LOCAL_CERTS, + IPSEC_LOCAL_CERT_PASS, IPSEC_LOCAL_ID, IPSEC_LOCAL_XAUTH_ID, IPSEC_LOCAL_XAUTH_AUTH, IPSEC_LOCAL_XAUTH_XAUTH_ID, IPSEC_REMOTE_AUTH, IPSEC_REMOTE_CERTS, + IPSEC_REMOTE_CERT_PASS, IPSEC_REMOTE_ID, IPSEC_REMOTE_XAUTH_ID, IPSEC_REMOTE_XAUTH_AUTH, @@ -129,6 +131,9 @@ typedef enum { IPSEC_CERT_TYPE, IPSEC_CERT_FLAG, IPSEC_CERT_DATA, + IPSEC_CERT_PASS, + IPSEC_PKEY_TYPE, + IPSEC_PKEY_DATA, IPSEC_KVS_MAX, } ipsec_kv_e; @@ -138,12 +143,14 @@ kv_s ipsec_setting_kvs[] = { {"IPsec.RightAddrs", NULL}, {"IPsec.LocalAuth", NULL}, {"IPsec.LocalCerts", NULL}, + {"IPsec.LocalCertPass", NULL}, {"IPsec.LocalID", NULL}, {"IPsec.LocalXauthID", NULL}, {"IPsec.LocalXauthAuth", NULL}, {"IPsec.LocalXauthXauthID", NULL}, {"IPsec.RemoteAuth", NULL}, {"IPsec.RemoteCerts", NULL}, + {"IPsec.RemoteCertPass", NULL}, {"IPsec.RemoteID", NULL}, {"IPsec.RemoteXauthID", NULL}, {"IPsec.RemoteXauthAuth", NULL}, @@ -157,6 +164,9 @@ kv_s ipsec_setting_kvs[] = { {"IPsec.CertType", NULL}, {"IPsec.CertFlag", NULL}, {"IPsec.CertData", NULL}, + {"IPsec.CertPass", NULL}, + {"IPsec.PKeyType", NULL}, + {"IPsec.PKeyData", NULL}, {NULL, NULL}, }; @@ -560,7 +570,9 @@ static void __gen_ipsec_hybrid_rsa_kvs(void) 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_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_REMOTE_CERTS].value = __get_user_input("File path for remote cert"); + ipsec_setting_kvs[IPSEC_CHILDREN_REMOTE_TS].value = g_strdup("0.0.0.0/0"); + ipsec_setting_kvs[IPSEC_CHILDREN_LOCAL_TS].value = g_strdup("0.0.0.0/0"); ipsec_setting_kvs[IPSEC_XAUTH_DATA].value = g_strdup("ABCDEFGH"); ipsec_setting_kvs[IPSEC_XAUTH_OWNERS].value = g_strdup("dave"); return; @@ -577,7 +589,10 @@ static void __gen_ipsec_xauth_psk_kvs(void) 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_CHILDREN_REMOTE_TS].value = g_strdup("0.0.0.0/0"); + ipsec_setting_kvs[IPSEC_CHILDREN_LOCAL_TS].value = g_strdup("0.0.0.0/0"); ipsec_setting_kvs[IPSEC_IKE_DATA].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_IKE_OWNERS].value = g_strdup("0.0.0.0/0"); ipsec_setting_kvs[IPSEC_XAUTH_DATA].value = g_strdup("ABCDEFGH"); ipsec_setting_kvs[IPSEC_XAUTH_OWNERS].value = g_strdup("dave"); return; @@ -591,15 +606,21 @@ static void __gen_ipsec_xauth_rsa_kvs(void) 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_CERT_PASS].value = __get_user_input("Local Certificate passwd"); 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_REMOTE_CERTS].value = __get_user_input("File path for remote cert"); + ipsec_setting_kvs[IPSEC_CHILDREN_REMOTE_TS].value = g_strdup("0.0.0.0/0"); + ipsec_setting_kvs[IPSEC_CHILDREN_LOCAL_TS].value = g_strdup("0.0.0.0/0"); 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_PASS].value = __get_user_input("Certificate passwd"); ipsec_setting_kvs[IPSEC_CERT_DATA].value = __get_user_input("File path for CA cert"); + ipsec_setting_kvs[IPSEC_PKEY_TYPE].value = g_strdup("RSA"); + ipsec_setting_kvs[IPSEC_PKEY_DATA].value = __get_user_input("File path for private key"); return; } static void __gen_ipsec_ikev2_psk_kvs(void) @@ -611,7 +632,10 @@ static void __gen_ipsec_ikev2_psk_kvs(void) 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_CHILDREN_REMOTE_TS].value = g_strdup("0.0.0.0/0"); + ipsec_setting_kvs[IPSEC_CHILDREN_LOCAL_TS].value = g_strdup("0.0.0.0/0"); ipsec_setting_kvs[IPSEC_IKE_DATA].value = g_strdup("ABCDEFGH"); + ipsec_setting_kvs[IPSEC_IKE_OWNERS].value = g_strdup("0.0.0.0/0"); return; } static void __gen_ipsec_ikev2_rsa_kvs() @@ -623,11 +647,17 @@ static void __gen_ipsec_ikev2_rsa_kvs() 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_CERT_PASS].value = __get_user_input("Local Certificate passwd"); 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_REMOTE_CERTS].value = __get_user_input("File path for remote cert"); + ipsec_setting_kvs[IPSEC_CHILDREN_REMOTE_TS].value = g_strdup("0.0.0.0/0"); + ipsec_setting_kvs[IPSEC_CHILDREN_LOCAL_TS].value = g_strdup("0.0.0.0/0"); 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"); + ipsec_setting_kvs[IPSEC_CERT_PASS].value = __get_user_input("Certificate passwd"); + ipsec_setting_kvs[IPSEC_PKEY_TYPE].value = g_strdup("RSA"); + ipsec_setting_kvs[IPSEC_PKEY_DATA].value = __get_user_input("File path for private key"); return; } -- 2.7.4