CryptoPkg/OpensslLib: Update INF files to support OpenSSL-1.1.0x build

[mirror_edk2.git] / CryptoPkg / Include / OpenSslSupport.h

diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h
index dad40e4b6b83304ab753f0b3fd662e2f16992469..e011a7cfee54d0b8136cdf043ddf5eb9e5d4b334 100644 (file)
--- a/CryptoPkg/Include/OpenSslSupport.h
+++ b/CryptoPkg/Include/OpenSslSupport.h
@@ -1,7 +1,7 @@
 /** @file\r
   Root include file to support building OpenSSL Crypto Library.\r
 \r
-Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -21,6 +21,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
+#define OPENSSLDIR ""\r
+#define ENGINESDIR ""\r
+\r
 #define MAX_STRING_SIZE  0x1000\r
 \r
 //\r
@@ -90,6 +93,7 @@ typedef VOID  *FILE;
 #define LOG_DEBUG    7                /* debug-level messages */\r
 #define LOG_PID      0x01             /* log the pid with each message */\r
 #define LOG_CONS     0x02             /* log on the console if errors in sending */\r
+#define CHAR_BIT     8                /* Number of bits in a char */\r
 \r
 //\r
 // Macros from EFI Application Toolkit required to build Open SSL\r
@@ -118,6 +122,8 @@ typedef UINT16         nlink_t;
 typedef int            pid_t;\r
 typedef void           *DIR;\r
 typedef void           __sighandler_t (int);\r
+typedef UINT8          __uint8_t;\r
+typedef UINT8          sa_family_t;\r
 \r
 //\r
 // Structures from EFI Application Toolkit required to build Open SSL\r
@@ -172,6 +178,12 @@ struct stat {
   INT64    st_qspare[2];\r
 };\r
 \r
+struct sockaddr {\r
+  __uint8_t sa_len;         /* total length */\r
+  sa_family_t sa_family;    /* address family */\r
+  char    sa_data[14];      /* actually longer; address value */\r
+};\r
+\r
 //\r
 // Externs from EFI Application Toolkit required to build Open SSL\r
 //\r
@@ -208,6 +220,9 @@ int            strncmp     (const char *, const char *, size_t);
 char           *strrchr    (const char *, int);\r
 unsigned long  strtoul     (const char *, char **, int);\r
 long           strtol      (const char *, char **, int);\r
+char           *strerror   (int);\r
+size_t         strspn      (const char *, const char *);\r
+size_t         strcspn     (const char *, const char *);\r
 int            printf      (const char *, ...);\r
 int            sscanf      (const char *, const char *, ...);\r
 int            open        (const char *, int, ...);\r
@@ -273,5 +288,6 @@ extern FILE  *stdout;
 #define localtime(timer)                  NULL\r
 #define gmtime_r(timer,result)            (result = NULL)\r
 #define atoi(nptr)                        AsciiStrDecimalToUintn(nptr)\r
+#define gettimeofday(tvp,tz)              do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)\r
 \r
 #endif\r