New option to add CRLs for s_client and s_server.
[openssl.git] / apps / pkeyutl.c
index 497ae97..7eb3f5c 100644 (file)
@@ -1,4 +1,4 @@
-/* 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 2006.
  */
 /* ====================================================================
@@ -99,7 +99,8 @@ int MAIN(int argc, char **argv)
        int keysize = -1;
 
        unsigned char *buf_in = NULL, *buf_out = NULL, *sig = NULL;
-       int buf_inlen = 0, buf_outlen, siglen = -1;
+       size_t buf_outlen;
+       int buf_inlen = 0, siglen = -1;
 
        int ret = 1, rv = -1;
 
@@ -118,17 +119,17 @@ int MAIN(int argc, char **argv)
                if (!strcmp(*argv,"-in"))
                        {
                        if (--argc < 1) badarg = 1;
-                        infile= *(++argv);
+                        else infile= *(++argv);
                        }
                else if (!strcmp(*argv,"-out"))
                        {
                        if (--argc < 1) badarg = 1;
-                       outfile= *(++argv);
+                       else outfile= *(++argv);
                        }
                else if (!strcmp(*argv,"-sigfile"))
                        {
                        if (--argc < 1) badarg = 1;
-                       sigfile= *(++argv);
+                       else sigfile= *(++argv);
                        }
                else if(!strcmp(*argv, "-inkey"))
                        {
@@ -158,17 +159,17 @@ int MAIN(int argc, char **argv)
                else if (!strcmp(*argv,"-passin"))
                        {
                        if (--argc < 1) badarg = 1;
-                       passargin= *(++argv);
+                       else passargin= *(++argv);
                        }
                else if (strcmp(*argv,"-peerform") == 0)
                        {
                        if (--argc < 1) badarg = 1;
-                       peerform=str2fmt(*(++argv));
+                       else peerform=str2fmt(*(++argv));
                        }
                else if (strcmp(*argv,"-keyform") == 0)
                        {
                        if (--argc < 1) badarg = 1;
-                       keyform=str2fmt(*(++argv));
+                       else keyform=str2fmt(*(++argv));
                        }
 #ifndef OPENSSL_NO_ENGINE
                else if(!strcmp(*argv, "-engine"))
@@ -314,20 +315,22 @@ int MAIN(int argc, char **argv)
                        }
                if(rev)
                        {
-                       int i;
+                       size_t i;
                        unsigned char ctmp;
-                       for(i = 0; i < buf_inlen/2; i++)
+                       size_t l = (size_t)buf_inlen;
+                       for(i = 0; i < l/2; i++)
                                {
                                ctmp = buf_in[i];
-                               buf_in[i] = buf_in[buf_inlen - 1 - i];
-                               buf_in[buf_inlen - 1 - i] = ctmp;
+                               buf_in[i] = buf_in[l - 1 - i];
+                               buf_in[l - 1 - i] = ctmp;
                                }
                        }
                }
 
        if(pkey_op == EVP_PKEY_OP_VERIFY)
                {
-               rv  = EVP_PKEY_verify(ctx, sig, siglen, buf_in, buf_inlen);
+               rv  = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
+                                     buf_in, (size_t)buf_inlen);
                if (rv == 0)
                        BIO_puts(out, "Signature Verification Failure\n");
                else if (rv == 1)
@@ -338,7 +341,7 @@ int MAIN(int argc, char **argv)
        else
                {       
                rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
-                                                       buf_in, buf_inlen);
+                             buf_in, (size_t)buf_inlen);
                if (rv > 0)
                        {
                        buf_out = OPENSSL_malloc(buf_outlen);
@@ -347,7 +350,7 @@ int MAIN(int argc, char **argv)
                        else
                                rv = do_keyop(ctx, pkey_op,
                                                buf_out, (size_t *)&buf_outlen,
-                                               buf_in, buf_inlen);
+                                               buf_in, (size_t)buf_inlen);
                        }
                }
 
@@ -387,7 +390,7 @@ static void usage()
        BIO_printf(bio_err, "Usage: pkeyutl [options]\n");
        BIO_printf(bio_err, "-in file        input file\n");
        BIO_printf(bio_err, "-out file       output file\n");
-       BIO_printf(bio_err, "-signature file signature file (verify operation only)\n");
+       BIO_printf(bio_err, "-sigfile file signature file (verify operation only)\n");
        BIO_printf(bio_err, "-inkey file     input key\n");
        BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
        BIO_printf(bio_err, "-pubin          input is a public key\n");