diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-08-01 00:01:45 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-08-01 07:02:34 +0000 |
| commit | 8d6e8f649894611dbe2feced7ae8eb3de863ff4b (patch) | |
| tree | cb4152434c02157513bfb1d5f12b8b2b7f7076d6 /wiretap/file_access.c | |
| parent | 75d4fac5f9163080eb442ae54c8ddbf526b8867f (diff) | |
RFC 7468 is PEM-inspired, but it's not PEM.
Do some renaming.
Change-Id: If8fa85370014f9618df38d97048dd1c52a4c389f
Reviewed-on: https://code.wireshark.org/review/28918
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 8 |
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 } }; |