diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-03 17:06:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-03 17:06:35 +0000 |
| commit | 6abbc68188ff0a8e44d6dca8874449faf2b4981f (patch) | |
| tree | b44f6efdf0c6c8225ff5b8583b5ef43c6609682e | |
| parent | 25f6c7fd8bc2b661ccf79e0fdf5b1ffc2515ce2c (diff) | |
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.
| -rw-r--r-- | apps/apps.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/apps.c b/apps/apps.c index 957939599f..7294c26f31 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -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); } |