Avoid a.out name table pollition.

[openssl.git] / apps / spkac.c

diff --git a/apps/spkac.c b/apps/spkac.c
index fa5dc248c88734b2addc97d2a27421125cd072f5..47ee53f1eef6e2cda64c0192ae2fdf2d1ee73180 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -92,12 +92,17 @@ int MAIN(int argc, char **argv)
        CONF *conf = NULL;
        NETSCAPE_SPKI *spki = NULL;
        EVP_PKEY *pkey = NULL;
+#ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
+#endif
 
        apps_startup();
 
        if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
+       if (!load_config(bio_err, NULL))
+               goto end;
+
        prog=argv[0];
        argc--;
        argv++;
@@ -138,11 +143,13 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        spksect= *(++argv);
                        }
+#ifndef OPENSSL_NO_ENGINE
                else if (strcmp(*argv,"-engine") == 0)
                        {
                        if (--argc < 1) goto bad;
                        engine= *(++argv);
                        }
+#endif
                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
                else if (strcmp(*argv,"-pubkey") == 0)
@@ -168,7 +175,9 @@ bad:
                BIO_printf(bio_err," -noout         don't print SPKAC\n");
                BIO_printf(bio_err," -pubkey        output public key\n");
                BIO_printf(bio_err," -verify        verify SPKAC signature\n");
+#ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
+#endif
                goto end;
                }
 
@@ -178,12 +187,14 @@ bad:
                goto end;
        }
 
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
+#endif
 
        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;
                }
@@ -292,5 +303,5 @@ end:
        EVP_PKEY_free(pkey);
        if(passin) OPENSSL_free(passin);
        apps_shutdown();
-       EXIT(ret);
+       OPENSSL_EXIT(ret);
        }