From: Dr. Stephen Henson Date: Sun, 9 Apr 2006 00:34:00 +0000 (+0000) Subject: Fix typo. Add EVP_PKEY_CTX control function for later use by command line X-Git-Tag: OpenSSL_0_9_8k^2~1428 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2318e86bdb3dc5fc2d17a12d3875964eedef424;p=oweals%2Fopenssl.git 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 c2afdd142a..1b7ca6961f 100644 --- 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; } +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) { diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c index 119d08b288..bac935c6d7 100644 --- 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; - 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;