Fix newly introduced typos and warnings in ./apps.

[openssl.git] / apps / spkac.c

diff --git a/apps/spkac.c b/apps/spkac.c
index 4ce53e36c9022820432338aa525719efafe22bd0..0191d0a783f7db816318bf53204460dce3efa5b6 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -87,12 +87,15 @@ int MAIN(int argc, char **argv)
        int verify=0,noout=0,pubkey=0;
        char *infile = NULL,*outfile = NULL,*prog;
        char *passargin = NULL, *passin = NULL;
-       char *spkac = "SPKAC", *spksect = "default", *spkstr = NULL;
+       const char *spkac = "SPKAC", *spksect = "default";
+       char *spkstr = NULL;
        char *challenge = NULL, *keyfile = NULL;
        CONF *conf = NULL;
        NETSCAPE_SPKI *spki = NULL;
        EVP_PKEY *pkey = NULL;
+#ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
+#endif
 
        apps_startup();
 
@@ -141,11 +144,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)
@@ -171,7 +176,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;
                }
 
@@ -181,7 +188,9 @@ bad:
                goto end;
        }
 
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
+#endif
 
        if(keyfile) {
                pkey = load_key(bio_err,
@@ -192,7 +201,7 @@ bad:
                }
                spki = NETSCAPE_SPKI_new();
                if(challenge) ASN1_STRING_set(spki->spkac->challenge,
-                                                challenge, strlen(challenge));
+                                                challenge, (int)strlen(challenge));
                NETSCAPE_SPKI_set_pubkey(spki, pkey);
                NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
                spkstr = NETSCAPE_SPKI_b64_encode(spki);
@@ -295,5 +304,5 @@ end:
        EVP_PKEY_free(pkey);
        if(passin) OPENSSL_free(passin);
        apps_shutdown();
-       EXIT(ret);
+       OPENSSL_EXIT(ret);
        }