diff options
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 0c054c4670..2e501dfeef 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -73,6 +73,7 @@ #include "nettrace_3gpp_32_423.h" #include "mplog.h" #include "dpa400.h" +#include "pem.h" /* * Add an extension, and all compressed versions thereof, to a GSList @@ -353,6 +354,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 }, { "Novell LANalyzer", OPEN_INFO_HEURISTIC, lanalyzer_open, "tr1", NULL, NULL }, /* * PacketLogger must come before MPEG, because its files @@ -1610,6 +1612,11 @@ static const struct file_type_subtype_info dump_open_table_base[] = { /* WTAP_FILE_TYPE_SUBTYPE_DPA400 */ { "Unigraf DisplayPort AUX channel monitor output parser", "dpa400", "bin", NULL, FALSE, FALSE, 0, + NULL, NULL, NULL }, + + /* WTAP_FILE_TYPE_SUBTYPE_PEM */ + { "ASN.1 (PEM-like encoding)", "pem", NULL, NULL, + FALSE, FALSE, 0, NULL, NULL, NULL } }; |