minor signed/unsigned warning fixes

[openssl.git] / apps / spkac.c

diff --git a/apps/spkac.c b/apps/spkac.c
index e3f434d24c8661a47cdb4010541324c11d758a8e..47ee53f1eef6e2cda64c0192ae2fdf2d1ee73180 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -63,8 +63,10 @@
 #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>
 
@@ -75,22 +77,32 @@
  * -out arg    - output file - default stdout
  */
 
+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;
+       BIO *in = NULL,*out = NULL;
        int verify=0,noout=0,pubkey=0;
-       char *infile = NULL,*outfile = NULL,*prog, *passin = NULL;
+       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;
+#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++;
@@ -109,18 +121,7 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-passin") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       passin= *(++argv);
-                       }
-               else if (strcmp(*argv,"-envpassin") == 0)
-                       {
-                       if (--argc < 1) goto bad;
-                               if(!(passin= getenv(*(++argv))))
-                               {
-                               BIO_printf(bio_err,
-                                "Can't read environment variable %s\n",
-                                                               *argv);
-                               badops = 1;
-                               }
+                       passargin= *(++argv);
                        }
                else if (strcmp(*argv,"-key") == 0)
                        {
@@ -142,6 +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)
@@ -161,30 +169,33 @@ bad:
                BIO_printf(bio_err," -in arg        input file\n");
                BIO_printf(bio_err," -out arg       output file\n");
                BIO_printf(bio_err," -key arg       create SPKAC using private key\n");
-               BIO_printf(bio_err," -passin arg    input file pass phrase\n");
-               BIO_printf(bio_err," -envpassin arg environment variable containing input file pass phrase\n");
+               BIO_printf(bio_err," -passin arg    input file pass phrase source\n");
                BIO_printf(bio_err," -challenge arg challenge string\n");
                BIO_printf(bio_err," -spkac arg     alternative SPKAC name\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");
+#endif
                goto end;
                }
 
        ERR_load_crypto_strings();
+       if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+               BIO_printf(bio_err, "Error getting password\n");
+               goto end;
+       }
+
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
 
        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, PEM_cb, passin);
+               pkey = load_key(bio_err,
+                               strcmp(keyfile, "-") ? keyfile : NULL,
+                               FORMAT_PEM, 1, 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();
@@ -195,7 +206,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");
@@ -203,7 +222,7 @@ bad:
                        goto end;
                }
                BIO_printf(out, "SPKAC=%s\n", spkstr);
-               Free(spkstr);
+               OPENSSL_free(spkstr);
                ret = 0;
                goto end;
        }
@@ -219,15 +238,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);
@@ -244,7 +264,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");
@@ -268,11 +296,12 @@ bad:
        ret = 0;
 
 end:
-       CONF_free(conf);
+       NCONF_free(conf);
        NETSCAPE_SPKI_free(spki);
        BIO_free(in);
-       BIO_free(out);
-       BIO_free(key);
+       BIO_free_all(out);
        EVP_PKEY_free(pkey);
-       EXIT(ret);
+       if(passin) OPENSSL_free(passin);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }