Fix typo. Add EVP_PKEY_CTX control function for later use by command line

utilities.

diff --git a/apps/apps.c b/apps/apps.c
index c2afdd142add290a0bada10aad6207685ccda733..1b7ca6961f545f7a1a5c7924de3b8ff5b5c440f7 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2304,6 +2304,24 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
        return ret;
        }
 
        return ret;
        }
 

+int pkey_ctrl_string(BIO *err, EVP_PKEY_CTX *ctx, char *value)
+       {
+       char *stmp, *vtmp = NULL;
+       stmp = BUF_strdup(value);
+       int rv;
+       if (!stmp)
+               return -1;
+       vtmp = strchr(stmp, ':');
+       if (vtmp)
+               {
+               *vtmp = 0;
+               vtmp++;
+               }
+       rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp);
+       OPENSSL_free(stmp);
+       return rv;
+       }
+

 static void nodes_print(BIO *out, const char *name,
        STACK_OF(X509_POLICY_NODE) *nodes)
        {
 static void nodes_print(BIO *out, const char *name,
        STACK_OF(X509_POLICY_NODE) *nodes)
        {

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index 119d08b28858150924d633c443351e3a6b85f649..bac935c6d7278e0e38f6d3f2024f8b3043acc65e 100644 (file)
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -168,7 +168,7 @@ int MAIN(int argc, char **argv)
                        hexdump = 1;
                else if(!strcmp(*argv, "-sign"))
                        pkey_op = EVP_PKEY_OP_SIGN;
                        hexdump = 1;
                else if(!strcmp(*argv, "-sign"))
                        pkey_op = EVP_PKEY_OP_SIGN;

-               else if(!strcmp(*argv, "-verifyr"))
+               else if(!strcmp(*argv, "-verify"))

                        pkey_op = EVP_PKEY_OP_VERIFY;
                else if(!strcmp(*argv, "-verifyrecover"))
                        pkey_op = EVP_PKEY_OP_VERIFYRECOVER;
                        pkey_op = EVP_PKEY_OP_VERIFY;
                else if(!strcmp(*argv, "-verifyrecover"))
                        pkey_op = EVP_PKEY_OP_VERIFYRECOVER;