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

PR: 1870

Browse Source 
Submitted by: kilroy <kilroy@mail.zutom.sk>
Approved by: steve@openssl.org

Handle pkcs12 format correctly by not assuming PEM format straight away.
This commit is contained in:
Dr. Stephen Henson 2009-04-03 17:06:35 +00:00
parent 25f6c7fd8b
commit 6abbc68188
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/apps.c
View File

@ -259,13 +259,6 @@ int str2fmt(char *s)
return(FORMAT_ASN1); return(FORMAT_ASN1);
else if ((*s == 'T') || (*s == 't')) else if ((*s == 'T') || (*s == 't'))
return(FORMAT_TEXT); return(FORMAT_TEXT);
else if ((*s == 'P') || (*s == 'p'))
{
if (s[1] == 'V' || s[1] == 'v')
return FORMAT_PVK;
else
return(FORMAT_PEM);
}
else if ((*s == 'N') || (*s == 'n')) else if ((*s == 'N') || (*s == 'n'))
return(FORMAT_NETSCAPE); return(FORMAT_NETSCAPE);
else if ((*s == 'S') || (*s == 's')) else if ((*s == 'S') || (*s == 's'))
@ -278,6 +271,13 @@ int str2fmt(char *s)
return(FORMAT_PKCS12); return(FORMAT_PKCS12);
else if ((*s == 'E') || (*s == 'e')) else if ((*s == 'E') || (*s == 'e'))
return(FORMAT_ENGINE); return(FORMAT_ENGINE);
else if ((*s == 'P') || (*s == 'p'))
{
if (s[1] == 'V' || s[1] == 'v')
return FORMAT_PVK;
else
return(FORMAT_PEM);
}
else else
return(FORMAT_UNDEF); return(FORMAT_UNDEF);
} }