Imported Upstream connman version 1.38
[platform/upstream/connman.git] / vpn / plugins / ipsec.c
index e4bbf2b..36502dd 100644 (file)
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <openssl/bio.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-#include <openssl/safestack.h>
-#include <openssl/pkcs12.h>
-#include <openssl/x509.h>
-#include <openssl/conf.h>
-
 #define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
 #include <connman/log.h>
@@ -67,18 +59,15 @@ static DBusConnection *connection;
 static VICIClient *vici_client;
 static GFileMonitor* monitor;
 
-struct openssl_private_data {
-       EVP_PKEY *private_key;
-       X509 *local_cert;
-       STACK_OF(X509) *ca_certs;
-};
-
 struct ipsec_private_data {
        struct vpn_provider *provider;
-       struct openssl_private_data openssl_data;
-       vpn_provider_connect_cb_t cb;
+       vpn_provider_connect_cb_t connect_cb;
+       void *connect_user_data;
+};
 
-       void *user_data;
+struct ipsec_event_data {
+       vpn_event_callback event_cb;
+       void *event_user_data;
 };
 
 struct {
@@ -158,316 +147,30 @@ static const char *ikev1_proposals [] ={
                NULL,
 };
 
-static const char *ikev2_esp_proposals = "aes256-aes128-sha512-sha384-sha256-sha1-modp2048-modp1536-modp1024";
+static const char *ikev2_esp_proposals = "aes256-aes128-sha256-sha1";
 
 static const char *ikev2_proposals = "aes256-aes128-sha512-sha384-sha256-sha1-modp2048-modp1536-modp1024";
 
-static void init_openssl(void)
-{
-       /* Load the human readable error strings for libcrypto */
-#if OPENSSL_API_COMPAT < 0x10100000L
-       /* TODO :remove this after debug */
-       DBG("openssl version is under 1.01");
-       ERR_load_crypto_strings();
-#else
-       /* As of version 1.1.0 OpenSSL will automatically allocate
-        * all resources that it needs so no explicit initialisation
-        * is required. Similarly it will also automatically
-        * deinitialise as required. */
-       /* OPENSSL_init_crypto(); */
-#endif
-       /* Load all digest and cipher algorithms */
-#if OPENSSL_API_COMPAT < 0x10100000L
-       OpenSSL_add_all_algorithms();
-#else
-        /* As of version 1.1.0 OpenSSL will automatically allocate
-         * all resources that it needs so no explicit initialisation
-         * is required. Similarly it will also automatically
-         * deinitialise as required. */
-        /* OPENSSL_init_crypto(); */
-#endif
-#if OPENSSL_API_COMPAT < 0x10100000L
-       OPENSSL_config(NULL);
-#else
-#endif
-       /* TODO :remove this after debug */
-       DBG("init openssl");
-       return;
-}
+static struct ipsec_event_data event_data;
 
-static void deinit_openssl(void)
+static void free_private_data(struct ipsec_private_data *data)
 {
-#if OPENSSL_API_COMPAT < 0x10100000L
-       EVP_cleanup();
-#else
-#endif
-#if OPENSSL_API_COMPAT < 0x10100000L
-       ERR_free_strings();
-#else
-#endif
-       return;
+       g_free(data);
 }
 
-static int print_openssl_error_cb(const char *str, size_t len, void *u)
+static int ipsec_notify(DBusMessage *msg, struct vpn_provider *provider)
 {
-       connman_error("%s", str);
        return 0;
 }
 
-static void print_openssl_error()
-{
-       ERR_print_errors_cb(print_openssl_error_cb, NULL);
-       return;
-}
-
-static int get_cert_type(const char *path)
-{
-       char *down_str = NULL;
-       int cert_type;
-
-       down_str = g_ascii_strdown(path, strlen(path));
-       if (!down_str)
-               return CERT_TYPE_NONE;
-
-       if(g_str_has_suffix(down_str, ".pem"))
-               cert_type = CERT_TYPE_PEM;
-       else if (g_str_has_suffix(down_str, ".der") || g_str_has_suffix(down_str, ".crt"))
-               cert_type = CERT_TYPE_DER;
-       else if (g_str_has_suffix(down_str, ".p12") || g_str_has_suffix(down_str, ".pfx"))
-               cert_type = CERT_TYPE_PKCS12;
-       else
-               cert_type = CERT_TYPE_NONE;
-       g_free(down_str);
-
-       return cert_type;
-}
-
-static void read_der_file(const char *path, X509 **cert)
-{
-       FILE *fp = NULL;
-
-       DBG("der path %s\n", path);
-       fp = fopen(path, "r");
-       *cert = d2i_X509_fp(fp, NULL);
-       fclose(fp);
-       return;
-}
-
-static void read_pem_file(const char *path, X509 **cert)
-{
-       FILE *fp = NULL;
-
-       DBG("pem path %s\n", path);
-       fp = fopen(path, "r");
-       *cert = PEM_read_X509(fp, cert, NULL, NULL);
-       fclose(fp);
-       return;
-}
-
-static void read_pkcs12_file(const char *path, const char *pass, EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca)
-{
-       FILE *fp = NULL;
-       PKCS12 *p12;
-
-       DBG("pkcs12 path %s\n", path);
-       fp = fopen(path, "r");
-
-       p12 = d2i_PKCS12_fp(fp, NULL);
-       if (!p12) {
-               print_openssl_error();
-               fclose(fp);
-               return;
-       }
-
-       if (!PKCS12_parse(p12, pass, pkey, cert, ca)) {
-               print_openssl_error();
-               fclose(fp);
-               return;
-       }
-
-       PKCS12_free(p12);
-       return;
-}
-
-static char *get_private_key_str(struct openssl_private_data *data)
-{
-       EVP_PKEY *pkey;
-       BIO* bio;
-       BUF_MEM *buf_ptr;
-       char *private_key_str = NULL;
-
-       if (!data)
-               return NULL;
-
-       if (!(pkey = data->private_key))
-               return NULL;
-
-       bio = BIO_new(BIO_s_mem());
-       if (!bio) {
-               print_openssl_error();
-               return NULL;
-       }
-
-       if (!PEM_write_bio_PrivateKey(bio, pkey, NULL, NULL, 0, NULL, NULL)) {
-               print_openssl_error();
-               BIO_free(bio);
-               return NULL;
-       }
-
-       BIO_get_mem_ptr(bio, &buf_ptr);
-       if (!buf_ptr) {
-               print_openssl_error();
-               BIO_free(bio);
-               return NULL;
-       }
-
-       private_key_str = g_try_malloc0(buf_ptr->length + 1);
-       if (!private_key_str) {
-               print_openssl_error();
-               BIO_free(bio);
-               return NULL;
-       }
-
-       g_strlcpy(private_key_str, buf_ptr->data, buf_ptr->length);
-
-       BIO_free(bio);
-
-       return private_key_str;
-}
-
-static char *get_cert_str(X509 *cert)
-{
-       BIO* bio;
-       BUF_MEM *buf_ptr;
-       char *cert_str = NULL;
-
-       if (!cert)
-               return NULL;
-
-       bio = BIO_new(BIO_s_mem());
-       if (!bio) {
-               print_openssl_error();
-               return NULL;
-       }
-
-       if (!PEM_write_bio_X509_AUX(bio, cert)) {
-               print_openssl_error();
-               BIO_free(bio);
-               return NULL;
-       }
-
-       BIO_get_mem_ptr(bio, &buf_ptr);
-       if (!buf_ptr) {
-               print_openssl_error();
-               BIO_free(bio);
-               return NULL;
-       }
-
-       cert_str = g_try_malloc0(buf_ptr->length + 1);
-       if (!cert_str) {
-               print_openssl_error();
-               BIO_free(bio);
-               return NULL;
-       }
-
-       g_strlcpy(cert_str, buf_ptr->data, buf_ptr->length);
-
-       BIO_free(bio);
-       return cert_str;
-}
-
-static char * get_local_cert_str(struct openssl_private_data *data)
-{
-       if (!data)
-               return NULL;
-
-       if (!(data->local_cert))
-               return NULL;
-
-       return get_cert_str(data->local_cert);
-}
-
-int get_ca_cert_num(struct openssl_private_data *data)
-{
-       if(!data || !data->ca_certs)
-               return 0;
-
-       return sk_X509_num(data->ca_certs);
-}
-
-static char * get_nth_ca_cert_str(struct openssl_private_data *data, int num)
-{
-       X509 *cert = NULL;
-
-       if (!data)
-               return NULL;
-
-       if (!(data->ca_certs))
-               return NULL;
-
-       cert = sk_X509_value(data->ca_certs, num);
-
-       return get_cert_str(cert);
-}
-
-static void extract_cert_info(const char *path, const char *pass, struct openssl_private_data *data)
-{
-       if(!path || !data) {
-               /* TODO :remove this after debug */
-               DBG("there's no cert data");
-               return;
-       }
-
-       switch (get_cert_type(path)) {
-       case CERT_TYPE_DER:
-               read_der_file(path, &(data->local_cert));
-               break;
-       case CERT_TYPE_PEM:
-               read_pem_file(path, &(data->local_cert));
-               break;
-       case CERT_TYPE_PKCS12:
-               read_pkcs12_file(path, pass, &(data->private_key), &(data->local_cert), &(data->ca_certs));
-               break;
-       default:
-               break;
-       }
-
-       return;
-}
-
-static void free_openssl_private_data(struct openssl_private_data *data)
+static void ipsec_set_event_cb(vpn_event_callback event_cb, struct vpn_provider *provider)
 {
-       if (!data)
-               return;
-
-       EVP_PKEY *private_key = data->private_key;
-       X509 *local_cert = data->local_cert;
-       STACK_OF(X509) *ca_certs = data->ca_certs;
-
-       if (private_key)
-               EVP_PKEY_free(private_key);
-
-       if (local_cert)
-               X509_free(local_cert);
-
-       if (ca_certs)
-               sk_X509_pop_free(ca_certs, X509_free);
-
+       DBG("set event cb!");
+       event_data.event_cb = event_cb;
+       event_data.event_user_data = provider;
        return;
 }
 
-static void free_private_data(struct ipsec_private_data *data)
-{
-       free_openssl_private_data(&(data->openssl_data));
-       deinit_openssl();
-       g_free(data);
-}
-
-static int ipsec_notify(DBusMessage *msg, struct vpn_provider *provider)
-{
-       return 0;
-}
-
 static int ipsec_is_same_auth(const char* req, const char* target)
 {
        if (req == NULL || target == NULL)
@@ -497,23 +200,6 @@ static int vici_load_cert(const char* type, const char* flag, const char* data)
        return ret;
 }
 
-static int vici_load_key(const char* type, const char* data)
-{
-       VICISection *sect;
-       sect = vici_create_section(NULL);
-       int ret = 0;
-
-       vici_add_kv(sect, "type", type, NULL);
-       vici_add_kv(sect, "data", data, NULL);
-       ret = vici_send_request(vici_client, VICI_CMD_LOAD_KEY, sect);
-       if (ret < 0)
-               connman_error("vici_send_request failed");
-
-       vici_destroy_section(sect);
-
-       return ret;
-}
-
 static void ipsec_add_default_child_sa_data(struct vpn_provider *provider, VICISection *child)
 {
        const char *version = vpn_provider_get_string(provider, "IPsec.Version");
@@ -524,6 +210,7 @@ static void ipsec_add_default_child_sa_data(struct vpn_provider *provider, VICIS
                for (list = NULL; ikev1_esp_proposals[i] != NULL; i++)
                        list = g_slist_append(list, g_strdup(ikev1_esp_proposals[i]));
                vici_add_list(child, "esp_proposals", list, "net");
+               g_slist_free_full(list, g_free);
                list = NULL;
        } else {
                vici_add_kvl(child, "esp_proposals", ikev2_esp_proposals, "net");
@@ -534,6 +221,9 @@ static void ipsec_add_default_child_sa_data(struct vpn_provider *provider, VICIS
 static void ipsec_add_default_conn_data(struct vpn_provider *provider, VICISection *conn)
 {
        const char *version = vpn_provider_get_string(provider, "IPsec.Version");
+       const char *remote_addr = vpn_provider_get_string(provider, "Host");
+
+       vici_add_kvl(conn, "remote_addrs", remote_addr, NULL);
        if (g_strcmp0(version, "1") == 0) {
                int i = 0;
                GSList *list;
@@ -541,11 +231,11 @@ static void ipsec_add_default_conn_data(struct vpn_provider *provider, VICISecti
                for (list = NULL; ikev1_proposals[i] != NULL; i++)
                        list = g_slist_append(list, g_strdup(ikev1_proposals[i]));
                vici_add_list(conn, "proposals", list, NULL);
+               g_slist_free_full(list, g_free);
                list = NULL;
 
                if (g_strcmp0(vpn_provider_get_string(provider, "IPsec.LocalAuth"), "psk") == 0)
                        vici_add_kv(conn, "aggressive", "yes", NULL);
-
        } else {
                vici_add_kvl(conn, "proposals", ikev2_proposals, NULL);
        }
@@ -554,6 +244,67 @@ static void ipsec_add_default_conn_data(struct vpn_provider *provider, VICISecti
        return;
 }
 
+static char *load_file_from_path(const char *path)
+{
+       struct stat st;
+       FILE *fp = NULL;
+       int fd = 0;
+       size_t  file_size = 0;
+       char *file_buff = NULL;
+
+       if (!path) {
+               connman_error("File path is NULL\n");
+               return NULL;
+       }
+
+       fp = fopen(path, "rb");
+       if (!fp) {
+               connman_error("fopen %s is failed\n", path);
+               return NULL;
+       }
+
+       fd = fileno(fp);
+       if (fd == -1) {
+               connman_error("fp is not a valid stream");
+               fclose(fp);
+               return NULL;
+       }
+
+       if (fstat(fd, &st) != 0) {
+               connman_error("fstat failed");
+               fclose(fp);
+               return NULL;
+       }
+
+       file_size = st.st_size;
+       file_buff = g_try_malloc0(sizeof(char)*st.st_size);
+       if (file_buff == NULL) {
+               connman_error("g_try_malloc0 failed\n");
+               fclose(fp);
+               return NULL;
+       }
+
+       if (fread(file_buff, 1, file_size, fp) != file_size) {
+               connman_error("file size not matched\n");
+               g_free(file_buff);
+               file_buff = NULL;
+       }
+
+       fclose(fp);
+       return file_buff;
+}
+
+static char * get_local_cert_str(struct vpn_provider *provider)
+{
+       const char *path;
+
+       if (!provider)
+               return NULL;
+
+       path = vpn_provider_get_string(provider, "IPsec.LocalCerts");
+
+       return load_file_from_path(path);
+}
 
 static int ipsec_load_conn(struct vpn_provider *provider, struct ipsec_private_data *data)
 {
@@ -587,7 +338,7 @@ static int ipsec_load_conn(struct vpn_provider *provider, struct ipsec_private_d
                ipsec_conn_options[i].add_elem(conn, key, value, subsection);
        }
 
-       local_cert_str = get_local_cert_str(&(data->openssl_data));
+       local_cert_str = get_local_cert_str(provider);
        if (local_cert_str) {
                /* TODO :remove this after debug */
                DBG("There's local certification to add local section");
@@ -607,42 +358,6 @@ static int ipsec_load_conn(struct vpn_provider *provider, struct ipsec_private_d
        return ret;
 }
 
-static int ipsec_load_private_data(struct ipsec_private_data *data)
-{
-       char *private_key_str;
-       char *ca_cert_str;
-       int ca_cert_num;
-       int i;
-       int ret = 0;
-
-       private_key_str = get_private_key_str(&(data->openssl_data));
-       if (private_key_str) {
-               /* TODO :remove this after debug */
-               DBG("load private key");
-               ret = vici_load_key("RSA", private_key_str);
-               g_free(private_key_str);
-       }
-
-       if (ret < 0)
-               return ret;
-
-       ca_cert_num = get_ca_cert_num(&(data->openssl_data));
-       if (ca_cert_num < 1)
-               return 0;
-
-       for (i = 0; i < ca_cert_num; i++) {
-               /* TODO :remove this after debug */
-               DBG("load CA cert");
-               ca_cert_str = get_nth_ca_cert_str(&(data->openssl_data), i);
-               ret = vici_load_cert("X509", "CA", ca_cert_str);
-               g_free(ca_cert_str);
-               if (ret < 0)
-                       return ret;
-       }
-
-       return ret;
-}
-
 static int ipsec_load_shared_psk(struct vpn_provider *provider)
 {
        const char *data;
@@ -652,7 +367,7 @@ static int ipsec_load_shared_psk(struct vpn_provider *provider)
 
        if (!provider) {
                connman_error("invalid provider");
-               ret = -EINVAL;
+               return -EINVAL;
        }
 
        data = vpn_provider_get_string(provider, "IPsec.IKEData");
@@ -714,45 +429,6 @@ static int ipsec_load_shared_xauth(struct vpn_provider *provider)
        return ret;
 }
 
-static char *load_file_from_path(const char *path)
-{
-       struct stat st;
-       FILE *fp = NULL;
-       int fd = 0;
-       size_t  file_size = 0;
-       char *file_buff = NULL;
-
-       if (path) {
-               connman_error("File path is NULL\n");
-               return NULL;
-       }
-
-       fp = fopen(path, "rb");
-       if (!fp) {
-               connman_error("fopen %s is failed\n", path);
-               return NULL;
-       }
-
-       fd = fileno(fp);
-       fstat(fd, &st);
-       file_size = st.st_size;
-       file_buff = g_try_malloc0(sizeof(char)*st.st_size);
-       if (file_buff == NULL) {
-               connman_error("g_try_malloc0 failed\n");
-               fclose(fp);
-               return NULL;
-       }
-
-       if (fread(file_buff, 1, file_size, fp) != file_size) {
-               connman_error("file size not matched\n");
-               g_free(file_buff);
-               file_buff = NULL;
-       }
-
-       fclose(fp);
-       return file_buff;
-}
-
 static int ipsec_load_key(struct vpn_provider *provider)
 {
        const char *type;
@@ -778,8 +454,10 @@ static int ipsec_load_key(struct vpn_provider *provider)
                return 0;
 
        sect = vici_create_section(NULL);
-       if (!sect)
+       if (!sect) {
+               g_free(data);
                return -ENOMEM;
+       }
 
        vici_add_kv(sect, "type", type, NULL);
        vici_add_kv(sect, "data", data, NULL);
@@ -841,6 +519,7 @@ static int ipsec_load_cert(struct vpn_provider *provider)
        DBG("CertType: %s, CertFalg: %s,CertData: %s", type, flag, data);
        if (!type || ! flag || !data) {
                connman_error("invalid certification information");
+               g_free(data);
                return -EINVAL;
        }
 
@@ -853,16 +532,71 @@ static int ipsec_load_cert(struct vpn_provider *provider)
        return ret;
 }
 
-void connect_reply_cb(int err, void *user_data)
+static int ipsec_terminate(struct vpn_provider *provider)
+{
+       VICISection *sect;
+       int ret = 0;
+
+       sect = vici_create_section(NULL);
+       if (!sect)
+               return -ENOMEM;
+
+       vici_add_kv(sect, "child", "net", NULL);
+       vici_add_kv(sect, "ike", vpn_provider_get_string(provider, "Name"), NULL);
+       vici_add_kv(sect, "timeout", "-1", NULL);
+       ret = vici_send_request(vici_client, VICI_CMD_TERMINATE, sect);
+       if (ret < 0)
+               connman_error("vici_send_request failed");
+
+       vici_destroy_section(sect);
+
+       return ret;
+}
+
+static void request_reply_cb(int err, void *user_data)
 {
        struct ipsec_private_data *data;
 
        data = (struct ipsec_private_data *)user_data;
-       data->cb(data->provider, data->user_data, err);
+       DBG("request reply cb");
+
+       if(err != 0) {
+               if (event_data.event_cb)
+                       event_data.event_cb(event_data.event_user_data, VPN_STATE_FAILURE);
+               /* TODO: Does close socket needed? */
+       } else {
+               DBG("Series of requests are succeeded");
+               /* TODO: Not sure about below */
+               if (event_data.event_cb)
+                       event_data.event_cb(event_data.event_user_data, VPN_STATE_CONNECT);
+       }
 
        free_private_data(data);
 }
 
+static void ipsec_vici_event_cb(VICIClientEvent event, void *user_data)
+{
+       struct vpn_provider *provider;
+
+       provider = (struct vpn_provider *)user_data;
+       if (!provider) {
+               DBG("Invalid user data");
+               return;
+       }
+
+       if(event == VICI_EVENT_CHILD_UP) {
+               if (event_data.event_cb)
+                       event_data.event_cb(event_data.event_user_data, VPN_STATE_READY);
+       } else if (event == VICI_EVENT_CHILD_DOWN) {
+               if (event_data.event_cb)
+                       event_data.event_cb(event_data.event_user_data, VPN_STATE_DISCONNECT);
+       } else {
+               DBG("Unknown event");
+       }
+
+       return;
+}
+
 static struct ipsec_private_data* create_ipsec_private_data(struct vpn_provider *provider,
                vpn_provider_connect_cb_t cb, void* user_data)
 {
@@ -873,11 +607,9 @@ static struct ipsec_private_data* create_ipsec_private_data(struct vpn_provider
                return NULL;
        }
 
-       init_openssl();
-
        data->provider = provider;
-       data->cb = cb;
-       data->user_data = user_data;
+       data->connect_cb = cb;
+       data->connect_user_data = user_data;
        return data;
 }
 
@@ -891,7 +623,7 @@ static void vici_connect(struct ipsec_private_data *data)
                IPSEC_ERROR_CHECK_GOTO(-1, done, "Invalid data parameter");
 
        provider = data->provider;
-       cb = data->cb;
+       cb = data->connect_cb;
        if (!provider || !cb)
                IPSEC_ERROR_CHECK_GOTO(-1, done, "Invalid provider or callback");
 
@@ -906,8 +638,15 @@ static void vici_connect(struct ipsec_private_data *data)
        /* TODO :remove this after debug */
        DBG("success to initialize vici socket");
 
-       vici_set_connect_reply_cb(vici_client, (vici_connect_reply_cb)connect_reply_cb, data);
+       vici_set_request_reply_cb(vici_client, (vici_request_reply_cb)request_reply_cb, data);
+       /*
+        * Sets child-updown event
+        */
+       err = vici_set_event_cb(vici_client, (vici_event_cb)ipsec_vici_event_cb, provider);
+       IPSEC_ERROR_CHECK_GOTO(err, done, "register event failed");
 
+       /* TODO :remove this after debug */
+       DBG("success to vici_set_event_cb");
        /*
         * Send the load-conn command
         */
@@ -917,12 +656,6 @@ static void vici_connect(struct ipsec_private_data *data)
        /* TODO :remove this after debug */
        DBG("success to ipsec_load_conn");
 
-       err = ipsec_load_private_data(data);
-       IPSEC_ERROR_CHECK_GOTO(err, done, "load private data failed");
-
-       /* TODO :remove this after debug */
-       DBG("success to ipsec_load_private_data");
-
        /*
         * Send the load-shared command for PSK
         */
@@ -968,8 +701,9 @@ static void vici_connect(struct ipsec_private_data *data)
 
 done:
        /* refer to connect_cb on vpn-provider.c for cb */
-       if(err != 0 && cb)
-               cb(provider, data->user_data, -err);
+       if(cb)
+               cb(provider, data->connect_user_data, -err);
+       /* TODO: Does close socket needed? when err is not zero */
 
        return;
 }
@@ -998,6 +732,8 @@ static void monitor_vici_socket(struct ipsec_private_data *data)
        if (error) {
                connman_error("g_file_monitor_directory failed: %s / %d", error->message, error->code);
                g_error_free(error);
+               if(event_data.event_cb)
+                       event_data.event_cb(event_data.event_user_data, VPN_STATE_FAILURE);
                return;
        }
        /* TODO :remove this after debug */
@@ -1017,14 +753,19 @@ static void check_vici_socket(struct ipsec_private_data *data)
        }
 }
 
+static void ipsec_died(struct connman_task *task, int exit_code, void *user_data)
+{
+       DBG("task %p exit_code %d", task, exit_code);
+       unlink(VICI_DEFAULT_URI);
+       vpn_died(task, exit_code, user_data);
+}
+
 static int ipsec_connect(struct vpn_provider *provider,
                        struct connman_task *task, const char *if_name,
                        vpn_provider_connect_cb_t cb, const char *dbus_sender,
                        void *user_data)
 {
        struct ipsec_private_data *data;
-       const char *path;
-       const char *pass;
        int err = 0;
 
        data = create_ipsec_private_data(provider, cb, user_data);
@@ -1035,18 +776,16 @@ static int ipsec_connect(struct vpn_provider *provider,
        /*
         * Start charon daemon using ipsec script of strongSwan.
         */
-       err = connman_task_run(task, vpn_died, provider, NULL, NULL, NULL);
+       err = connman_task_run(task, ipsec_died, provider, NULL, NULL, NULL);
        if (err < 0) {
                connman_error("charon start failed");
                if (cb)
                        cb(provider, user_data, err);
+
+               g_free(data);
                return err;
        }
 
-       path = vpn_provider_get_string(provider, "IPsec.LocalCerts");
-       pass = vpn_provider_get_string(provider, "IPsec.LocalCertPass");
-       extract_cert_info(path, pass, &(data->openssl_data));
-
        check_vici_socket(data);
 //     g_usleep(G_USEC_PER_SEC);
 
@@ -1143,14 +882,22 @@ static int ipsec_save(struct vpn_provider *provider, GKeyFile *keyfile)
 static void ipsec_disconnect(struct vpn_provider *provider)
 {
        int err = 0;
+       /*
+        * Send the terminate command
+        */
+       err = ipsec_terminate(provider);
+       IPSEC_ERROR_CHECK_RETURN(err, "terminate failed");
 
        err = vici_deinitialize(vici_client);
        IPSEC_ERROR_CHECK_RETURN(err, "failed to deinitialize vici_client");
+
+       return;
 }
 
 static struct vpn_driver vpn_driver = {
        .flags = VPN_FLAG_NO_TUN,
        .notify = ipsec_notify,
+       .set_event_cb = ipsec_set_event_cb,
        .connect = ipsec_connect,
        .error_code = ipsec_error_code,
        .save = ipsec_save,
@@ -1161,6 +908,9 @@ static int ipsec_init(void)
 {
        connection = connman_dbus_get_connection();
 
+       event_data.event_cb = NULL;
+       event_data.event_user_data = NULL;
+
        return vpn_register("ipsec", &vpn_driver, IPSEC);
 }