Only use DSA-functions if available.

[openssl.git] / apps / spkac.c

diff --git a/apps/spkac.c b/apps/spkac.c
index d7e46782f79e238365af53d12f22be53a66f5508..049a37963c2b6511f2251456cfca43f1e6223466 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/engine.h>
 
 #undef PROG
 #define PROG   spkac_main
@@ -84,13 +83,13 @@ int MAIN(int argc, char **argv)
        {
        ENGINE *e = NULL;
        int i,badops=0, ret = 1;
-       BIO *in = NULL,*out = NULL, *key = NULL;
+       BIO *in = NULL,*out = 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;
        char *challenge = NULL, *keyfile = NULL;
-       LHASH *conf = NULL;
+       CONF *conf = NULL;
        NETSCAPE_SPKI *spki = NULL;
        EVP_PKEY *pkey = NULL;
        char *engine=NULL;
@@ -99,6 +98,9 @@ int MAIN(int argc, char **argv)
 
        if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
+       if (!load_config(bio_err, NULL))
+               goto end;
+
        prog=argv[0];
        argc--;
        argv++;
@@ -179,36 +181,13 @@ bad:
                goto end;
        }
 
-       if (engine != NULL)
-               {
-               if((e = ENGINE_by_id(engine)) == NULL)
-                       {
-                       BIO_printf(bio_err,"invalid engine \"%s\"\n",
-                               engine);
-                       goto end;
-                       }
-               if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-                       {
-                       BIO_printf(bio_err,"can't use that engine\n");
-                       goto end;
-                       }
-               BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
-               /* Free our "structural" reference. */
-               ENGINE_free(e);
-               }
+        e = setup_engine(bio_err, engine, 0);
 
        if(keyfile) {
-               if(strcmp(keyfile, "-")) key = BIO_new_file(keyfile, "r");
-               else key = BIO_new_fp(stdin, BIO_NOCLOSE);
-               if(!key) {
-                       BIO_printf(bio_err, "Error opening key file\n");
-                       ERR_print_errors(bio_err);
-                       goto end;
-               }
-               pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, passin);
+               pkey = load_key(bio_err,
+                               strcmp(keyfile, "-") ? keyfile : NULL,
+                               FORMAT_PEM, passin, e, "private key");
                if(!pkey) {
-                       BIO_printf(bio_err, "Error reading private key\n");
-                       ERR_print_errors(bio_err);
                        goto end;
                }
                spki = NETSCAPE_SPKI_new();
@@ -221,7 +200,7 @@ bad:
                if (outfile) out = BIO_new_file(outfile, "w");
                else {
                        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                        {
                            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                            out = BIO_push(tmpbio, out);
@@ -251,15 +230,16 @@ bad:
                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;
        }
 
-       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);
@@ -278,7 +258,7 @@ bad:
        if (outfile) out = BIO_new_file(outfile, "w");
        else {
                out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                {
                    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                    out = BIO_push(tmpbio, out);
@@ -308,12 +288,12 @@ bad:
        ret = 0;
 
 end:
-       CONF_free(conf);
+       NCONF_free(conf);
        NETSCAPE_SPKI_free(spki);
        BIO_free(in);
        BIO_free_all(out);
-       BIO_free(key);
        EVP_PKEY_free(pkey);
        if(passin) OPENSSL_free(passin);
+       apps_shutdown();
        EXIT(ret);
        }