aboutsummaryrefslogtreecommitdiff
path: root/openssl/apps/x509.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-27 20:31:28 +0100
committermarha <marha@users.sourceforge.net>2012-01-27 20:31:28 +0100
commitc6a1477b0092762299491d79b3a8cb094c6456da (patch)
tree8458d152a6d4cecd8b2d88f3e7e6950128a53fb7 /openssl/apps/x509.c
parenteb4c088eb71f93b9639f4ff651523d794f1433f7 (diff)
downloadvcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.tar.gz
vcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.tar.bz2
vcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.zip
update to openssl 1.0.0g
Diffstat (limited to 'openssl/apps/x509.c')
-rw-r--r--openssl/apps/x509.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/apps/x509.c b/openssl/apps/x509.c
index ed1e8c69a..9f5eaeb6b 100644
--- a/openssl/apps/x509.c
+++ b/openssl/apps/x509.c
@@ -987,7 +987,7 @@ bad:
else
{
pk=load_key(bio_err,
- keyfile, FORMAT_PEM, 0,
+ keyfile, keyformat, 0,
passin, e, "request key");
if (pk == NULL) goto end;
}