[openssl] master update

[kaishen.yy at antfin.com]

The branch master has been updated
       via  98b687f8d053662f8d7fee586d5a91d86fecdfee (commit)
      from  7f0a8dc7f9c5c35af0f66aca553304737931d55f (commit)


- Log -----------------------------------------------------------------
commit 98b687f8d053662f8d7fee586d5a91d86fecdfee
Author: Paul Yang <kaishen.yy at antfin.com>
Date:   Thu Sep 12 16:57:23 2019 +0800

    Fix test error if scrypt is disabled
    
    Fix no-scrypt.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9840)

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

Summary of changes:
 test/evp_test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/evp_test.c b/test/evp_test.c
index 67a818d98d..69ccb9739e 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1989,7 +1989,8 @@ static int kdf_test_init(EVP_TEST *t, const char *name)
     EVP_KDF *kdf;
 
 #ifdef OPENSSL_NO_SCRYPT
-    if (strcmp(name, "scrypt") == 0) {
+    /* TODO(3.0) Replace with "scrypt" once aliases are supported */
+    if (strcmp(name, "id-scrypt") == 0) {
         t->skip = 1;
         return 1;
     }