ipsec: cli bug fixes

[vpp.git] / src / vnet / ipsec / ipsec_cli.c

diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c
index 22fbcdf..648455b 100644 (file)
--- a/src/vnet/ipsec/ipsec_cli.c
+++ b/src/vnet/ipsec/ipsec_cli.c
@@ -82,7 +82,8 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm,
   ipsec_protocol_t proto;
   ipsec_sa_flags_t flags;
   clib_error_t *error;
-  ipsec_key_t ck, ik;
+  ipsec_key_t ck = { 0 };
+  ipsec_key_t ik = { 0 };
   int is_add, rv;
   u32 id, spi;
 
@@ -619,6 +620,10 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm,
   u8 ipv4_set = 0;
   u8 ipv6_set = 0;
   clib_error_t *error = NULL;
+  ipsec_key_t rck = { 0 };
+  ipsec_key_t lck = { 0 };
+  ipsec_key_t lik = { 0 };
+  ipsec_key_t rik = { 0 };
 
   clib_memset (&a, 0, sizeof (a));
   a.is_add = 1;
@@ -659,6 +664,28 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm,
        a.anti_replay = 1;
       else if (unformat (line_input, "tx-table %u", &a.tx_table_id))
        ;
+      else
+       if (unformat
+           (line_input, "local-crypto-key %U", unformat_ipsec_key, &lck))
+       ;
+      else
+       if (unformat
+           (line_input, "remote-crypto-key %U", unformat_ipsec_key, &rck))
+       ;
+      else if (unformat (line_input, "crypto-alg %U",
+                        unformat_ipsec_crypto_alg, &a.crypto_alg))
+       ;
+      else
+       if (unformat
+           (line_input, "local-integ-key %U", unformat_ipsec_key, &lik))
+       ;
+      else
+       if (unformat
+           (line_input, "rmote-integ-key %U", unformat_ipsec_key, &rik))
+       ;
+      else if (unformat (line_input, "integ-alg %U",
+                        unformat_ipsec_integ_alg, &a.integ_alg))
+       ;
       else if (unformat (line_input, "del"))
        a.is_add = 0;
       else
@@ -681,6 +708,16 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm,
   if (ipv4_set && ipv6_set)
     return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
 
+  clib_memcpy (a.local_crypto_key, lck.data, lck.len);
+  a.local_crypto_key_len = lck.len;
+  clib_memcpy (a.remote_crypto_key, rck.data, rck.len);
+  a.remote_crypto_key_len = rck.len;
+
+  clib_memcpy (a.local_integ_key, lik.data, lik.len);
+  a.local_integ_key_len = lck.len;
+  clib_memcpy (a.remote_integ_key, rik.data, rik.len);
+  a.remote_integ_key_len = rck.len;
+
   rv = ipsec_add_del_tunnel_if (&a);
 
   switch (rv)