From b12963227d7637d8431f64964940393509ce3325 Mon Sep 17 00:00:00 2001
From: Steffen Waterkamp <steffen.waterkamp@greenbone.net>
Date: Wed, 30 Jan 2019 15:37:18 +0100
Subject: [PATCH] Add option to not use a credential for PKCS12

---
 gsa/src/web/pages/alerts/component.js            | 2 +-
 gsa/src/web/pages/alerts/sourcefiremethodpart.js | 4 ++--
 gsad/src/gsad_gmp.c                              | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gsa/src/web/pages/alerts/component.js b/gsa/src/web/pages/alerts/component.js
index c89211c72e..7408f80b60 100644
--- a/gsa/src/web/pages/alerts/component.js
+++ b/gsa/src/web/pages/alerts/component.js
@@ -670,7 +670,7 @@ class AlertComponent extends React.Component {
           method_data_smb_file_path_type: undefined,
           method_data_verinice_server_report_format: select_verinice_report_id(
             report_formats),
-          method_data_pkcs12_credential: undefined,
+          method_data_pkcs12_credential: UNSET_VALUE,
           method_data_vfire_credential: undefined,
           method_data_vfire_base_url: undefined,
           method_data_vfire_call_description: undefined,
diff --git a/gsa/src/web/pages/alerts/sourcefiremethodpart.js b/gsa/src/web/pages/alerts/sourcefiremethodpart.js
index 218c6b805e..aa9fe89d3d 100644
--- a/gsa/src/web/pages/alerts/sourcefiremethodpart.js
+++ b/gsa/src/web/pages/alerts/sourcefiremethodpart.js
@@ -37,7 +37,7 @@ import TextField from 'web/components/form/textfield';
 import FileField from 'web/components/form/filefield';
 
 import PropTypes from 'web/utils/proptypes';
-import {renderSelectItems} from 'web/utils/render';
+import {renderSelectItems, UNSET_VALUE} from 'web/utils/render';
 import withPrefix from 'web/utils/withPrefix';
 
 const SourcefireMethodPart = ({
@@ -81,7 +81,7 @@ const SourcefireMethodPart = ({
         <Divider>
           <Select
             name={prefix + 'pkcs12_credential'}
-            items={renderSelectItems(credentialOptions)}
+            items={renderSelectItems(credentialOptions, UNSET_VALUE)}
             value={pkcs12Credential}
             onChange={onCredentialChange}
           />
diff --git a/gsad/src/gsad_gmp.c b/gsad/src/gsad_gmp.c
index 012ef84449..16aef10165 100644
--- a/gsad/src/gsad_gmp.c
+++ b/gsad/src/gsad_gmp.c
@@ -7393,7 +7393,8 @@ append_alert_method_data (GString *xml, params_t *data, const char *method,
       {
         if (strcmp (name, "defense_center_ip") == 0
             || strcmp (name, "defense_center_port") == 0
-            || strcmp (name, "pkcs12_credential") == 0)
+            || (strcmp (name, "pkcs12_credential") == 0
+                && !str_equal (param->value, "0")))
           xml_string_append (xml,
                              "<data><name>%s</name>%s</data>",
                              name,