aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/file_access.c
diff options
context:
space:
mode:
Diffstat (limited to 'wiretap/file_access.c')
-rw-r--r--wiretap/file_access.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 4cc15b3d94..4f9b3ffb6f 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -73,7 +73,7 @@
#include "nettrace_3gpp_32_423.h"
#include "mplog.h"
#include "dpa400.h"
-#include "pem.h"
+#include "rfc7468.h"
#include "ruby_marshal.h"
/*
@@ -356,7 +356,7 @@ static const struct open_info open_info_base[] = {
{ "MIME Files Format", OPEN_INFO_MAGIC, mime_file_open, NULL, NULL, NULL },
{ "Micropross mplog", OPEN_INFO_MAGIC, mplog_open, "mplog", NULL, NULL },
{ "Unigraf DPA-400 capture", OPEN_INFO_MAGIC, dpa400_open, "bin", NULL, NULL },
- { "ASN.1 (PEM-like encoding)", OPEN_INFO_MAGIC, pem_open, "pem;crt", NULL, NULL },
+ { "RFC 7468 files", OPEN_INFO_MAGIC, rfc7468_open, "pem;crt", NULL, NULL },
{ "Novell LANalyzer", OPEN_INFO_HEURISTIC, lanalyzer_open, "tr1", NULL, NULL },
/*
* PacketLogger must come before MPEG, because its files
@@ -1617,8 +1617,8 @@ static const struct file_type_subtype_info dump_open_table_base[] = {
FALSE, FALSE, 0,
NULL, NULL, NULL },
- /* WTAP_FILE_TYPE_SUBTYPE_PEM */
- { "ASN.1 (PEM-like encoding)", "pem", NULL, NULL,
+ /* WTAP_FILE_TYPE_SUBTYPE_RFC7468 */
+ { "RFC 7468 files", "rfc7468", NULL, NULL,
FALSE, FALSE, 0,
NULL, NULL, NULL }
};