From: Pierre Chifflier <chifflier@wzdftpd.net>
Date: Fri, 2 Mar 2018 18:35:49 +0000 (+0100)
Subject: Remove the 'experimental' mark for IKEv2
X-Git-Tag: suricata-4.1.0-rc1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e4cf00c07dfa403f7a736945635546b70367bd0;p=thirdparty%2Fsuricata.git

Remove the 'experimental' mark for IKEv2
---

diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index 53e5a2630f..4cb837437e 100644
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -10,7 +10,7 @@ debug = true
 
 [features]
 lua = []
-experimental = ["ntp-parser", "ipsec-parser"]
+experimental = ["ntp-parser"]
 strict = []
 debug = []
 
@@ -22,4 +22,4 @@ der-parser = "0.5.2"
 kerberos-parser = "0.1.0"
 
 ntp-parser = { version = "^0", optional = true }
-ipsec-parser = { version = "0.3", optional = true }
+ipsec-parser = "~0.3.0"
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index d3bacd3528..ba44491ee3 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -50,7 +50,6 @@ pub mod nfs;
 pub mod ftp;
 pub mod smb;
 
-#[cfg(feature = "experimental")]
 pub mod ikev2;
 
 #[cfg(feature = "experimental")]
diff --git a/src/app-layer-ikev2.c b/src/app-layer-ikev2.c
index 884b3a50c2..cc6d5f2c25 100644
--- a/src/app-layer-ikev2.c
+++ b/src/app-layer-ikev2.c
@@ -34,7 +34,7 @@
 
 #include "app-layer-ikev2.h"
 
-#if defined(HAVE_RUST) && defined(HAVE_RUST_EXTERNAL)
+#ifdef HAVE_RUST
 
 #include "rust-ikev2-ikev2-gen.h"
 
diff --git a/src/output-json-ikev2.c b/src/output-json-ikev2.c
index b23de0abff..efba7980ab 100644
--- a/src/output-json-ikev2.c
+++ b/src/output-json-ikev2.c
@@ -47,7 +47,7 @@
 #include "app-layer-ikev2.h"
 #include "output-json-ikev2.h"
 
-#if defined(HAVE_RUST) && defined(HAVE_RUST_EXTERNAL)
+#ifdef HAVE_RUST
 #ifdef HAVE_LIBJANSSON
 
 #include "rust.h"