[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  5ffc33244cd4d66e47dfa66ce89cb38d0f3074cc (commit)
      from  280cc0180862ae6664b88d5ea12cb5f599000d36 (commit)


- Log -----------------------------------------------------------------
commit 5ffc33244cd4d66e47dfa66ce89cb38d0f3074cc
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 29 17:15:16 2019 +0100

    Fix pkeyutl -verifyrecover
    
    When performing a pkeyutl -verifyrecover operation the input file is not
    a hash - it is the signature itself. Therefore don't do the check to make
    sure it looks like a hash.
    
    Fixes #9658
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9731)

-----------------------------------------------------------------------

Summary of changes:
 apps/pkeyutl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index c8cac0d676..6b012211e4 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -398,8 +398,7 @@ int pkeyutl_main(int argc, char **argv)
     if (!rawin
             && buf_inlen > EVP_MAX_MD_SIZE
             && (pkey_op == EVP_PKEY_OP_SIGN
-                || pkey_op == EVP_PKEY_OP_VERIFY
-                || pkey_op == EVP_PKEY_OP_VERIFYRECOVER)) {
+                || pkey_op == EVP_PKEY_OP_VERIFY)) {
         BIO_printf(bio_err,
                    "Error: The input data looks too long to be a hash\n");
         goto end;