aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-07-31 23:24:24 -0700
committerGuy Harris <guy@alum.mit.edu>2018-08-01 06:25:00 +0000
commit75d4fac5f9163080eb442ae54c8ddbf526b8867f (patch)
treee57f1d4e1d1fd58a7b547bf52203803c1f5ec05c /file.c
parent24e44a6ae698a5894c8a81761ff5a52599add4d0 (diff)
No need to tell the BER dissector the file name for RFC 7468 files.
It's just a hack for "raw BER data" files, giving them a file name that includes the OID to use for the syntax. For RFC 7468 files, the syntax is determined from the label in the pre-encapsulation boundary. Change-Id: Ia656f20f123d2c6a85041f83714a3a1cfefb70b1 Reviewed-on: https://code.wireshark.org/review/28916 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file.c')
-rw-r--r--file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/file.c b/file.c
index 6e67ba1fc0..6768395303 100644
--- a/file.c
+++ b/file.c
@@ -316,8 +316,7 @@ cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_temp
packet_list_queue_draw();
cf_callback_invoke(cf_cb_file_opened, cf);
- if ((cf->cd_t == WTAP_FILE_TYPE_SUBTYPE_BER)
- || (cf->cd_t == WTAP_FILE_TYPE_SUBTYPE_PEM)) {
+ if (cf->cd_t == WTAP_FILE_TYPE_SUBTYPE_BER) {
/* tell the BER dissector the file name */
ber_set_filename(cf->filename);
}