projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure toupper() is declared
[oweals/openssl.git]
/
apps
/
spkac.c
diff --git
a/apps/spkac.c
b/apps/spkac.c
index d43dc9f3b9b480b47f58e1209248a99d26a83ae6..4ce53e36c9022820432338aa525719efafe22bd0 100644
(file)
--- a/
apps/spkac.c
+++ b/
apps/spkac.c
@@
-69,7
+69,6
@@
#include <openssl/lhash.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/lhash.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
-#include <openssl/engine.h>
#undef PROG
#define PROG spkac_main
#undef PROG
#define PROG spkac_main
@@
-99,6
+98,9
@@
int MAIN(int argc, char **argv)
if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+ if (!load_config(bio_err, NULL))
+ goto end;
+
prog=argv[0];
argc--;
argv++;
prog=argv[0];
argc--;
argv++;
@@
-184,7
+186,7
@@
bad:
if(keyfile) {
pkey = load_key(bio_err,
strcmp(keyfile, "-") ? keyfile : NULL,
if(keyfile) {
pkey = load_key(bio_err,
strcmp(keyfile, "-") ? keyfile : NULL,
- FORMAT_PEM, passin, e, "private key");
+ FORMAT_PEM,
1,
passin, e, "private key");
if(!pkey) {
goto end;
}
if(!pkey) {
goto end;
}