Document extension clash.
[openssl.git] / apps / spkac.c
index 918efc0..0e01ea9 100644 (file)
@@ -1,6 +1,6 @@
 /* apps/spkac.c */
 
 /* apps/spkac.c */
 
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999. Based on an original idea by Massimiliano Pala
  * (madwolf@openca.org).
  */
  * project 1999. Based on an original idea by Massimiliano Pala
  * (madwolf@openca.org).
  */
@@ -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
@@ -88,17 +87,23 @@ int MAIN(int argc, char **argv)
        int verify=0,noout=0,pubkey=0;
        char *infile = NULL,*outfile = NULL,*prog;
        char *passargin = NULL, *passin = NULL;
        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;
        char *challenge = NULL, *keyfile = NULL;
-       LHASH *conf = NULL;
+       CONF *conf = NULL;
        NETSCAPE_SPKI *spki = NULL;
        EVP_PKEY *pkey = NULL;
        NETSCAPE_SPKI *spki = NULL;
        EVP_PKEY *pkey = NULL;
+#ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
        char *engine=NULL;
+#endif
 
        apps_startup();
 
        if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
 
        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++;
        prog=argv[0];
        argc--;
        argv++;
@@ -139,11 +144,13 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        spksect= *(++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);
                        }
                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)
                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
                else if (strcmp(*argv,"-pubkey") == 0)
@@ -169,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");
                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");
                BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
+#endif
                goto end;
                }
 
                goto end;
                }
 
@@ -179,18 +188,20 @@ bad:
                goto end;
        }
 
                goto end;
        }
 
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
         e = setup_engine(bio_err, engine, 0);
+#endif
 
        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;
                }
                spki = NETSCAPE_SPKI_new();
                if(challenge) ASN1_STRING_set(spki->spkac->challenge,
                if(!pkey) {
                        goto end;
                }
                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);
                NETSCAPE_SPKI_set_pubkey(spki, pkey);
                NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
                spkstr = NETSCAPE_SPKI_b64_encode(spki);
@@ -228,15 +239,16 @@ bad:
                goto end;
        }
 
                goto end;
        }
 
-       conf = CONF_load_bio(NULL, in, NULL);
+       conf = NCONF_new(NULL);
+       i = NCONF_load_bio(conf, in, NULL);
 
 
-       if(!conf) {
+       if(!i) {
                BIO_printf(bio_err, "Error parsing config file\n");
                ERR_print_errors(bio_err);
                goto end;
        }
 
                BIO_printf(bio_err, "Error parsing config file\n");
                ERR_print_errors(bio_err);
                goto end;
        }
 
-       spkstr = CONF_get_string(conf, spksect, spkac);
+       spkstr = NCONF_get_string(conf, spksect, spkac);
                
        if(!spkstr) {
                BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
                
        if(!spkstr) {
                BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
@@ -273,7 +285,7 @@ bad:
        pkey = NETSCAPE_SPKI_get_pubkey(spki);
        if(verify) {
                i = NETSCAPE_SPKI_verify(spki, pkey);
        pkey = NETSCAPE_SPKI_get_pubkey(spki);
        if(verify) {
                i = NETSCAPE_SPKI_verify(spki, pkey);
-               if(i) BIO_printf(bio_err, "Signature OK\n");
+               if (i > 0) BIO_printf(bio_err, "Signature OK\n");
                else {
                        BIO_printf(bio_err, "Signature Failure\n");
                        ERR_print_errors(bio_err);
                else {
                        BIO_printf(bio_err, "Signature Failure\n");
                        ERR_print_errors(bio_err);
@@ -285,12 +297,12 @@ bad:
        ret = 0;
 
 end:
        ret = 0;
 
 end:
-       CONF_free(conf);
+       NCONF_free(conf);
        NETSCAPE_SPKI_free(spki);
        BIO_free(in);
        BIO_free_all(out);
        EVP_PKEY_free(pkey);
        if(passin) OPENSSL_free(passin);
        apps_shutdown();
        NETSCAPE_SPKI_free(spki);
        BIO_free(in);
        BIO_free_all(out);
        EVP_PKEY_free(pkey);
        if(passin) OPENSSL_free(passin);
        apps_shutdown();
-       EXIT(ret);
+       OPENSSL_EXIT(ret);
        }
        }