aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorРоман Донченко <dpb@corrigendum.ru>2018-04-09 01:15:01 +0300
committerStig Bjørlykke <stig@bjorlykke.org>2018-05-15 12:47:06 +0000
commit3ba56ce586dbad693f1865a7241d4cd1152cd761 (patch)
tree5f55b8ac6649e3b5f724e1eb5dfd10ca29c06442 /file.c
parent48fac2a18debb2969413e03f3d88bbb9c31500ae (diff)
wiretap: Add a reader for files in the PEM-like format specified by RFC 7468
Change-Id: I8109025120d01c915f3a9d5550aa9272ec83893a Reviewed-on: https://code.wireshark.org/review/27334 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'file.c')
-rw-r--r--file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/file.c b/file.c
index de1f65af1b..c9b9878f81 100644
--- a/file.c
+++ b/file.c
@@ -318,7 +318,8 @@ 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) {
+ if ((cf->cd_t == WTAP_FILE_TYPE_SUBTYPE_BER)
+ || (cf->cd_t == WTAP_FILE_TYPE_SUBTYPE_PEM)) {
/* tell the BER dissector the file name */
ber_set_filename(cf->filename);
}