[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9feb2fce6553df7b2d75cf283826b97407eea55b (commit)
      from  527eb8d2949be19b1bc7b2fa84d0105091bb0928 (commit)


- Log -----------------------------------------------------------------
commit 9feb2fce6553df7b2d75cf283826b97407eea55b
Author: Kelvin Lee <kiyolee at gmail.com>
Date:   Wed Dec 2 00:25:01 2020 +1100

    Fix simpledynamic.c - a typo and missed a header
    
    CLA: trivial
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13584)

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

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

diff --git a/test/simpledynamic.c b/test/simpledynamic.c
index 41a910caa2..bbeeae02a4 100644
--- a/test/simpledynamic.c
+++ b/test/simpledynamic.c
@@ -9,6 +9,7 @@
 
 #include <stdlib.h>              /* For NULL */
 #include <openssl/macros.h>      /* For NON_EMPTY_TRANSLATION_UNIT */
+#include <openssl/e_os2.h>
 #include "simpledynamic.h"
 
 #if defined(DSO_DLFCN)
@@ -42,7 +43,7 @@ const char *sd_error(void)
 
 #elif defined(DSO_WIN32)
 
-nt sd_load(const char *filename, SD *lib, ossl_unused int type)
+int sd_load(const char *filename, SD *lib, ossl_unused int type)
 {
     *lib = LoadLibraryA(filename);
     return *lib == NULL ? 0 : 1;