generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from main, all conflicts resolved.

Browse Source 
(I do this far too seldom...)
This commit is contained in:
Richard Levitte
2000-07-12 16:34:34 +00:00
parent a6f8bbcad9
commit cb9c5dc571
44 changed files with 3942 additions and 2132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apps.c
View File

@@ -164,6 +164,8 @@ int str2fmt(char *s)
return(FORMAT_PEM);
else if ((*s == 'N') || (*s == 'n'))
return(FORMAT_NETSCAPE);
else if ((*s == 'S') || (*s == 's'))
return(FORMAT_SMIME);
else if ((*s == '1')
|| (strcmp(s,"PKCS12") == 0) || (strcmp(s,"pkcs12") == 0)
|| (strcmp(s,"P12") == 0) || (strcmp(s,"p12") == 0))