diff options
-rw-r--r-- | epan/dissectors/packet-smtp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 8e02a99f6f..42a9567ae1 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -79,7 +79,7 @@ static int ett_smtp_cmdresp = -1; static gint ett_smtp_data_fragment = -1; static gint ett_smtp_data_fragments = -1; -static gboolean stmp_decryption_enabled = FALSE; +static gboolean smtp_decryption_enabled = FALSE; /* desegmentation of SMTP command and response lines */ static gboolean smtp_desegment = TRUE; static gboolean smtp_data_desegment = TRUE; @@ -315,7 +315,7 @@ decode_plain_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 *decrypt = NULL; decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, a_offset, a_linelen, ENC_ASCII); - if (stmp_decryption_enabled) { + if (smtp_decryption_enabled) { returncode = (gint)ws_base64_decode_inplace(decrypt); if (returncode) { length_user1 = (gint)strlen(decrypt); @@ -576,7 +576,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (pinfo->fd->num >= session_state->first_auth_frame) && ((session_state->last_auth_frame == 0) || (pinfo->fd->num <= session_state->last_auth_frame))) { decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); - if ((stmp_decryption_enabled) && (ws_base64_decode_inplace(decrypt) > 0)) { + if ((smtp_decryption_enabled) && (ws_base64_decode_inplace(decrypt) > 0)) { line = decrypt; } else { line = tvb_get_ptr(tvb, loffset, linelen); @@ -833,7 +833,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); - if (stmp_decryption_enabled) { + if (smtp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); @@ -847,7 +847,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); - if (stmp_decryption_enabled) { + if (smtp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); @@ -859,7 +859,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, "Pass: %s", format_text(decrypt, linelen)); } else if (session_state->ntlm_rsp_frame == pinfo->fd->num) { decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); - if (stmp_decryption_enabled) { + if (smtp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); @@ -903,7 +903,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 11, linelen - 11, ENC_ASCII); - if (stmp_decryption_enabled) { + if (smtp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 11, linelen - 11, ENC_ASCII); @@ -919,7 +919,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 10, linelen - 10, ENC_ASCII); - if (stmp_decryption_enabled) { + if (smtp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 10, linelen - 10, ENC_ASCII); @@ -1099,7 +1099,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) decrypt = NULL; if (linelen >= 4) { - if ((stmp_decryption_enabled) && (code == 334)) { + if ((smtp_decryption_enabled) && (code == 334)) { decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 4, linelen - 4, ENC_ASCII); if (ws_base64_decode_inplace(decrypt) > 0) { if (g_ascii_strncasecmp(decrypt, "NTLMSSP", 7) == 0) { @@ -1284,7 +1284,7 @@ proto_register_smtp(void) prefs_register_bool_preference(smtp_module, "decryption", "Decrypt AUTH parameters", "Whether the SMTP dissector should decrypt AUTH parameters", - &stmp_decryption_enabled); + &smtp_decryption_enabled); } /* The registration hand-off routine */ |