Commit 6abbc681 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1870 

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

Handle pkcs12 format correctly by not assuming PEM format straight away.
parent 25f6c7fd

apps/apps.c

+7 −7
Original line number Diff line number Diff line
@@ -259,13 +259,6 @@ int str2fmt(char *s) 
		return(FORMAT_ASN1);

	else if ((*s == 'T') || (*s == 't'))

		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'))

  		return(FORMAT_NETSCAPE);

  	else if ((*s == 'S') || (*s == 's'))
@@ -278,6 +271,13 @@ int str2fmt(char *s) 
		return(FORMAT_PKCS12);

	else if ((*s == 'E') || (*s == 'e'))

		return(FORMAT_ENGINE);

	else if ((*s == 'P') || (*s == 'p'))

 		{

 		if (s[1] == 'V' || s[1] == 'v')

 			return FORMAT_PVK;

 		else

  			return(FORMAT_PEM);

 		}

	else

		return(FORMAT_UNDEF);

	}