Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3

(Never good to name a branch after version anticipated to include it ...)

src/file_analysis/analyzer/x509/Plugin.cc

@@ -0,0 +1,25 @@
+// See the file  in the main distribution directory for copyright.
+
+
+#include "plugin/Plugin.h"
+
+#include "X509.h"
+
+namespace plugin {
+namespace Bro_X509 {
+
+class Plugin : public plugin::Plugin {
+public:
+	plugin::Configuration Configure()
+		{
+		AddComponent(new ::file_analysis::Component("X509", ::file_analysis::X509::Instantiate));
+
+		plugin::Configuration config;
+		config.name = "Bro::X509";
+		config.description = "X509 analyzer";
+		return config;
+		}
+} plugin;
+
+}
+}