Rename function EC_GROUP_precompute to EC_GROUP_precompute_mult,

[openssl.git] / apps / spkac.c

diff --git a/apps/spkac.c b/apps/spkac.c
index b35354a8d795a82e5ea0b86f105d0d4d3e268cb8..5ac9b14c54b2035c56cb1989d240ff0272ea53b9 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -63,10 +63,13 @@
 #include <time.h>
 #include "apps.h"
 #include <openssl/bio.h>
+#include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/engine.h>
 
 #undef PROG
 #define PROG   spkac_main
@@ -79,6 +82,7 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
+       ENGINE *e = NULL;
        int i,badops=0, ret = 1;
        BIO *in = NULL,*out = NULL, *key = NULL;
        int verify=0,noout=0,pubkey=0;
@@ -89,6 +93,7 @@ int MAIN(int argc, char **argv)
        LHASH *conf = NULL;
        NETSCAPE_SPKI *spki = NULL;
        EVP_PKEY *pkey = NULL;
+       char *engine=NULL;
 
        apps_startup();
 
@@ -134,6 +139,11 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        spksect= *(++argv);
                        }
+               else if (strcmp(*argv,"-engine") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       engine= *(++argv);
+                       }
                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
                else if (strcmp(*argv,"-pubkey") == 0)
@@ -159,6 +169,7 @@ 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," -engine e      use engine e, possibly a hardware device.\n");
                goto end;
                }
 
@@ -168,6 +179,24 @@ 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);
+               }
+
        if(keyfile) {
                if(strcmp(keyfile, "-")) key = BIO_new_file(keyfile, "r");
                else key = BIO_new_fp(stdin, BIO_NOCLOSE);
@@ -190,7 +219,15 @@ bad:
                spkstr = NETSCAPE_SPKI_b64_encode(spki);
 
                if (outfile) out = BIO_new_file(outfile, "w");
-               else out = BIO_new_fp(stdout, BIO_NOCLOSE);
+               else {
+                       out = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+                       {
+                           BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                           out = BIO_push(tmpbio, out);
+                       }
+#endif
+               }
 
                if(!out) {
                        BIO_printf(bio_err, "Error opening output file\n");
@@ -198,7 +235,7 @@ bad:
                        goto end;
                }
                BIO_printf(out, "SPKAC=%s\n", spkstr);
-               Free(spkstr);
+               OPENSSL_free(spkstr);
                ret = 0;
                goto end;
        }
@@ -239,7 +276,15 @@ bad:
        }
 
        if (outfile) out = BIO_new_file(outfile, "w");
-       else out = BIO_new_fp(stdout, BIO_NOCLOSE);
+       else {
+               out = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+               {
+                   BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                   out = BIO_push(tmpbio, out);
+               }
+#endif
+       }
 
        if(!out) {
                BIO_printf(bio_err, "Error opening output file\n");
@@ -266,9 +311,9 @@ end:
        CONF_free(conf);
        NETSCAPE_SPKI_free(spki);
        BIO_free(in);
-       BIO_free(out);
+       BIO_free_all(out);
        BIO_free(key);
        EVP_PKEY_free(pkey);
-       if(passin) Free(passin);
+       if(passin) OPENSSL_free(passin);
        EXIT(ret);
        }