Skip to content

Update string.c with PEM keys and certs as string types #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rocketraman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update string.c with PEM keys and certs as string types #234

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/util/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,15 @@ int mime_type_is_text(const char *mime_type) {
* as being a Publisher file. Note that it
* handles private keys, which do not have
* a .pub extension, correctly.
*
* Also special case PEM certs and keys.
*/
int special
= strstr(mime_type, "application/vnd.ms-publisher") != NULL
|| str_has_suffix(mime_type, "pgp-keys");
|| str_has_suffix(mime_type, "pgp-keys")
|| strstr(mime_type, "application/x-pem-key")
|| strstr(mime_type, "application/pkcs8+pem")
|| strstr(mime_type, "application/pkix-cert+pem");

return basic || common || special;
}
Expand Down