Cleaning-up CRT Library Wrapper for the third-party cryptography
library building. The changes includes
1. Rename OpenSslSupport.h to CrtLibSupport.h for future alternative
crypto provider support.
2. Remove all un-referenced CRT APIs and headers.
(NOTE: More cleans-up could be possible after OpenSSL integrate the
extra PR request: https://github.com/openssl/openssl/pull/2961)
Cc: Ting Ye <ting.ye@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Lin <glin@suse.com>
Cc: Ronald Cron <ronald.cron@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qin Long <qin.long@intel.com>
---
CryptoPkg/Include/CrtLibSupport.h | 193 ++++++++++++++
CryptoPkg/Include/OpenSslSupport.h | 292 ---------------------
CryptoPkg/Include/arpa/inet.h | 16 --
CryptoPkg/Include/assert.h | 7 +-
CryptoPkg/Include/ctype.h | 7 +-
CryptoPkg/Include/dirent.h | 16 --
CryptoPkg/Include/errno.h | 7 +-
CryptoPkg/Include/limits.h | 7 +-
CryptoPkg/Include/malloc.h | 16 --
CryptoPkg/Include/math.h | 16 --
CryptoPkg/Include/memory.h | 7 +-
CryptoPkg/Include/netdb.h | 16 --
CryptoPkg/Include/netinet/in.h | 16 --
CryptoPkg/Include/sgtty.h | 16 --
CryptoPkg/Include/signal.h | 16 --
CryptoPkg/Include/stdarg.h | 7 +-
CryptoPkg/Include/stddef.h | 6 +-
CryptoPkg/Include/stdio.h | 7 +-
CryptoPkg/Include/stdlib.h | 7 +-
CryptoPkg/Include/string.h | 7 +-
CryptoPkg/Include/strings.h | 6 +-
CryptoPkg/Include/sys/ioctl.h | 16 --
CryptoPkg/Include/sys/param.h | 16 --
CryptoPkg/Include/sys/socket.h | 16 --
CryptoPkg/Include/sys/stat.h | 16 --
CryptoPkg/Include/sys/time.h | 7 +-
CryptoPkg/Include/sys/times.h | 16 --
CryptoPkg/Include/sys/types.h | 7 +-
CryptoPkg/Include/sys/un.h | 16 --
CryptoPkg/Include/syslog.h | 6 +-
CryptoPkg/Include/time.h | 6 +-
CryptoPkg/Include/unistd.h | 6 +-
CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h | 4 +-
.../BaseCryptLib/SysCall/BaseMemAllocation.c | 5 +-
.../BaseCryptLib/SysCall/ConstantTimeClock.c | 6 +-
.../Library/BaseCryptLib/SysCall/CrtWrapper.c | 185 ++++++-------
.../Library/BaseCryptLib/SysCall/HelperWrapper.c | 54 ----
.../BaseCryptLib/SysCall/RuntimeMemAllocation.c | 3 +-
.../Library/BaseCryptLib/SysCall/TimerWrapper.c | 4 +-
39 files changed, 346 insertions(+), 731 deletions(-)
create mode 100644 CryptoPkg/Include/CrtLibSupport.h
delete mode 100644 CryptoPkg/Include/OpenSslSupport.h
delete mode 100644 CryptoPkg/Include/arpa/inet.h
delete mode 100644 CryptoPkg/Include/dirent.h
delete mode 100644 CryptoPkg/Include/malloc.h
delete mode 100644 CryptoPkg/Include/math.h
delete mode 100644 CryptoPkg/Include/netdb.h
delete mode 100644 CryptoPkg/Include/netinet/in.h
delete mode 100644 CryptoPkg/Include/sgtty.h
delete mode 100644 CryptoPkg/Include/signal.h
delete mode 100644 CryptoPkg/Include/sys/ioctl.h
delete mode 100644 CryptoPkg/Include/sys/param.h
delete mode 100644 CryptoPkg/Include/sys/socket.h
delete mode 100644 CryptoPkg/Include/sys/stat.h
delete mode 100644 CryptoPkg/Include/sys/times.h
delete mode 100644 CryptoPkg/Include/sys/un.h
delete mode 100644 CryptoPkg/Library/BaseCryptLib/SysCall/HelperWrapper.c
diff --git a/CryptoPkg/Include/CrtLibSupport.h b/CryptoPkg/Include/CrtLibSupport.h
new file mode 100644
index 0000000000..ddf7784a37
--- /dev/null
+++ b/CryptoPkg/Include/CrtLibSupport.h
@@ -0,0 +1,193 @@
+/** @file
+ Root include file of C runtime library to support building the third-party
+ cryptographic library.
+
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __CRT_LIB_SUPPORT_H__
+#define __CRT_LIB_SUPPORT_H__
+
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PrintLib.h>
+
+#define OPENSSLDIR ""
+#define ENGINESDIR ""
+
+#define MAX_STRING_SIZE 0x1000
+
+//
+// OpenSSL relies on explicit configuration for word size in crypto/bn,
+// but we want it to be automatically inferred from the target. So we
+// bypass what's in <openssl/opensslconf.h> for OPENSSL_SYS_UEFI, and
+// define our own here.
+//
+#ifdef CONFIG_HEADER_BN_H
+#error CONFIG_HEADER_BN_H already defined
+#endif
+
+#define CONFIG_HEADER_BN_H
+
+#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) || defined(MDE_CPU_IA64)
+//
+// With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC needs
+// SIXTY_FOUR_BIT, because 'long' is 32-bit and only 'long long' is
+// 64-bit. Since using 'long long' works fine on GCC too, just do that.
+//
+#define SIXTY_FOUR_BIT
+#elif defined(MDE_CPU_IA32) || defined(MDE_CPU_ARM) || defined(MDE_CPU_EBC)
+#define THIRTY_TWO_BIT
+#else
+#error Unknown target architecture
+#endif
+
+//
+// Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h
+//
+#if !defined(__CC_ARM) // if va_list is not already defined
+#define va_list VA_LIST
+#define va_arg VA_ARG
+#define va_start VA_START
+#define va_end VA_END
+#else // __CC_ARM
+#define va_start(Marker, Parameter) __va_start(Marker, Parameter)
+#define va_arg(Marker, TYPE) __va_arg(Marker, TYPE)
+#define va_end(Marker) ((void)0)
+#endif
+
+//
+// Definitions for global constants used by CRT library routines
+//
+#define EINVAL 22 /* Invalid argument */
+#define INT_MAX 0x7FFFFFFF /* Maximum (signed) int value */
+#define LONG_MAX 0X7FFFFFFFL /* max value for a long */
+#define LONG_MIN (-LONG_MAX-1) /* min value for a long */
+#define ULONG_MAX 0xFFFFFFFF /* Maximum unsigned long value */
+#define CHAR_BIT 8 /* Number of bits in a char */
+
+//
+// Basic types mapping
+//
+typedef UINTN size_t;
+typedef INTN ssize_t;
+typedef INT32 time_t;
+typedef UINT8 __uint8_t;
+typedef UINT8 sa_family_t;
+typedef UINT32 uid_t;
+typedef UINT32 gid_t;
+
+//
+// File operations are not required for EFI building,
+// so FILE is mapped to VOID * to pass build
+//
+typedef VOID *FILE;
+
+//
+// Structures Definitions
+//
+struct tm {
+ int tm_sec; /* seconds after the minute [0-60] */
+ int tm_min; /* minutes after the hour [0-59] */
+ int tm_hour; /* hours since midnight [0-23] */
+ int tm_mday; /* day of the month [1-31] */
+ int tm_mon; /* months since January [0-11] */
+ int tm_year; /* years since 1900 */
+ int tm_wday; /* days since Sunday [0-6] */
+ int tm_yday; /* days since January 1 [0-365] */
+ int tm_isdst; /* Daylight Savings Time flag */
+ long tm_gmtoff; /* offset from CUT in seconds */
+ char *tm_zone; /* timezone abbreviation */
+};
+
+struct timeval {
+ long tv_sec; /* time value, in seconds */
+ long tv_usec; /* time value, in microseconds */
+};
+
+struct sockaddr {
+ __uint8_t sa_len; /* total length */
+ sa_family_t sa_family; /* address family */
+ char sa_data[14]; /* actually longer; address value */
+};
+
+//
+// Global variables
+//
+extern int errno;
+extern FILE *stderr;
+
+//
+// Function prototypes of CRT Library routines
+//
+void *malloc (size_t);
+void *realloc (void *, size_t);
+void free (void *);
+void *memset (void *, int, size_t);
+int isdigit (int);
+int isspace (int);
+int isxdigit (int);
+int isalnum (int);
+int isupper (int);
+int tolower (int);
+int strcmp (const char *, const char *);
+int strncasecmp (const char *, const char *, size_t);
+char *strrchr (const char *, int);
+unsigned long strtoul (const char *, char **, int);
+long strtol (const char *, char **, int);
+char *strerror (int);
+size_t strspn (const char *, const char *);
+size_t strcspn (const char *, const char *);
+int printf (const char *, ...);
+int sscanf (const char *, const char *, ...);
+FILE *fopen (const char *, const char *);
+size_t fread (void *, size_t, size_t, FILE *);
+size_t fwrite (const void *, size_t, size_t, FILE *);
+int fclose (FILE *);
+int fprintf (FILE *, const char *, ...);
+time_t time (time_t *);
+struct tm *gmtime (const time_t *);
+uid_t getuid (void);
+uid_t geteuid (void);
+gid_t getgid (void);
+gid_t getegid (void);
+void qsort (void *, size_t, size_t, int (*)(const void *, const void *));
+char *getenv (const char *);
+#if defined(__GNUC__) && (__GNUC__ >= 2)
+void abort (void) __attribute__((__noreturn__));
+#else
+void abort (void);
+#endif
+
+//
+// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
+//
+#define memcpy(dest,source,count) CopyMem(dest,source,(UINTN)(count))
+#define memset(dest,ch,count) SetMem(dest,(UINTN)(count),(UINT8)(ch))
+#define memchr(buf,ch,count) ScanMem8(buf,(UINTN)(count),(UINT8)ch)
+#define memcmp(buf1,buf2,count) (int)(CompareMem(buf1,buf2,(UINTN)(count)))
+#define memmove(dest,source,count) CopyMem(dest,source,(UINTN)(count))
+#define strlen(str) (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE))
+#define strcpy(strDest,strSource) AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)
+#define strncpy(strDest,strSource,count) AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)
+#define strcat(strDest,strSource) AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource)
+#define strchr(str,ch) ScanMem8((VOID *)(str),AsciiStrSize(str),(UINT8)ch)
+#define strncmp(string1,string2,count) (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))
+#define strcasecmp(str1,str2) (int)AsciiStriCmp(str1,str2)
+#define sprintf(buf,...) AsciiSPrint(buf,MAX_STRING_SIZE,__VA_ARGS__)
+#define localtime(timer) NULL
+#define assert(expression)
+#define offsetof(type,member) OFFSET_OF(type,member)
+#define atoi(nptr) AsciiStrDecimalToUintn(nptr)
+#define gettimeofday(tvp,tz) do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)
+
+#endif
diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h
deleted file mode 100644
index e6858a94a4..0000000000
--- a/CryptoPkg/Include/OpenSslSupport.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/** @file
- Root include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef __OPEN_SSL_SUPPORT_H__
-#define __OPEN_SSL_SUPPORT_H__
-
-#include <Base.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/DebugLib.h>
-
-#define OPENSSLDIR ""
-#define ENGINESDIR ""
-
-#define MAX_STRING_SIZE 0x1000
-
-//
-// OpenSSL relies on explicit configuration for word size in crypto/bn,
-// but we want it to be automatically inferred from the target. So we
-// bypass what's in <openssl/opensslconf.h> for OPENSSL_SYS_UEFI, and
-// define our own here.
-//
-#ifdef CONFIG_HEADER_BN_H
-#error CONFIG_HEADER_BN_H already defined
-#endif
-
-#define CONFIG_HEADER_BN_H
-
-#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) || defined(MDE_CPU_IA64)
-//
-// With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC needs
-// SIXTY_FOUR_BIT, because 'long' is 32-bit and only 'long long' is
-// 64-bit. Since using 'long long' works fine on GCC too, just do that.
-//
-#define SIXTY_FOUR_BIT
-#elif defined(MDE_CPU_IA32) || defined(MDE_CPU_ARM) || defined(MDE_CPU_EBC)
-#define THIRTY_TWO_BIT
-#else
-#error Unknown target architecture
-#endif
-
-//
-// File operations are not required for building Open SSL,
-// so FILE is mapped to VOID * to pass build
-//
-typedef VOID *FILE;
-
-//
-// Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h
-//
-#if !defined(__CC_ARM) // if va_list is not already defined
-#define va_list VA_LIST
-#define va_arg VA_ARG
-#define va_start VA_START
-#define va_end VA_END
-#else // __CC_ARM
-#define va_start(Marker, Parameter) __va_start(Marker, Parameter)
-#define va_arg(Marker, TYPE) __va_arg(Marker, TYPE)
-#define va_end(Marker) ((void)0)
-#endif
-
-//
-// #defines from EFI Application Toolkit required to build Open SSL
-//
-#define ENOMEM 12 /* Cannot allocate memory */
-#define EINVAL 22 /* Invalid argument */
-#define BUFSIZ 1024 /* size of buffer used by setbuf */
-#define INT_MAX 2147483647 /* max value for an int */
-#define INT_MIN (-2147483647-1) /* min value for an int */
-#define LONG_MAX 2147483647L /* max value for a long */
-#define LONG_MIN (-2147483647-1) /* min value for a long */
-#define ULONG_MAX 0xffffffff /* max value for an unsigned long */
-#define LOG_DAEMON (3<<3) /* system daemons */
-#define LOG_EMERG 0 /* system is unusable */
-#define LOG_ALERT 1 /* action must be taken immediately */
-#define LOG_CRIT 2 /* critical conditions */
-#define LOG_ERR 3 /* error conditions */
-#define LOG_WARNING 4 /* warning conditions */
-#define LOG_NOTICE 5 /* normal but significant condition */
-#define LOG_INFO 6 /* informational */
-#define LOG_DEBUG 7 /* debug-level messages */
-#define LOG_PID 0x01 /* log the pid with each message */
-#define LOG_CONS 0x02 /* log on the console if errors in sending */
-#define CHAR_BIT 8 /* Number of bits in a char */
-
-//
-// Macros from EFI Application Toolkit required to build Open SSL
-//
-/* The offsetof() macro calculates the offset of a structure member
- in its structure. Unfortunately this cannot be written down
- portably, hence it is provided by a Standard C header file.
- For pre-Standard C compilers, here is a version that usually works
- (but watch out!): */
-#define offsetof(type, member) OFFSET_OF (type, member)
-
-//
-// Basic types from EFI Application Toolkit required to build Open SSL
-//
-typedef UINTN size_t;
-typedef INTN ssize_t;
-typedef INT64 off_t;
-typedef UINT16 mode_t;
-typedef long time_t;
-typedef unsigned long clock_t;
-typedef UINT32 uid_t;
-typedef UINT32 gid_t;
-typedef UINT32 ino_t;
-typedef UINT32 dev_t;
-typedef UINT16 nlink_t;
-typedef int pid_t;
-typedef void *DIR;
-typedef void __sighandler_t (int);
-typedef UINT8 __uint8_t;
-typedef UINT8 sa_family_t;
-
-//
-// Structures from EFI Application Toolkit required to build Open SSL
-//
-struct tm {
- int tm_sec; /* seconds after the minute [0-60] */
- int tm_min; /* minutes after the hour [0-59] */
- int tm_hour; /* hours since midnight [0-23] */
- int tm_mday; /* day of the month [1-31] */
- int tm_mon; /* months since January [0-11] */
- int tm_year; /* years since 1900 */
- int tm_wday; /* days since Sunday [0-6] */
- int tm_yday; /* days since January 1 [0-365] */
- int tm_isdst; /* Daylight Savings Time flag */
- long tm_gmtoff; /* offset from CUT in seconds */
- char *tm_zone; /* timezone abbreviation */
-};
-
-struct timeval {
- long tv_sec; /* time value, in seconds */
- long tv_usec; /* time value, in microseconds */
-};
-
-struct dirent {
- UINT32 d_fileno; /* file number of entry */
- UINT16 d_reclen; /* length of this record */
- UINT8 d_type; /* file type, see below */
- UINT8 d_namlen; /* length of string in d_name */
- char d_name[255 + 1]; /* name must be no longer than this */
-};
-
-struct stat {
- dev_t st_dev; /* inode's device */
- ino_t st_ino; /* inode's number */
- mode_t st_mode; /* inode protection mode */
- nlink_t st_nlink; /* number of hard links */
- uid_t st_uid; /* user ID of the file's owner */
- gid_t st_gid; /* group ID of the file's group */
- dev_t st_rdev; /* device type */
- time_t st_atime; /* time of last access */
- long st_atimensec; /* nsec of last access */
- time_t st_mtime; /* time of last data modification */
- long st_mtimensec; /* nsec of last data modification */
- time_t st_ctime; /* time of last file status change */
- long st_ctimensec; /* nsec of last file status change */
- off_t st_size; /* file size, in bytes */
- INT64 st_blocks; /* blocks allocated for file */
- UINT32 st_blksize; /* optimal blocksize for I/O */
- UINT32 st_flags; /* user defined flags for file */
- UINT32 st_gen; /* file generation number */
- INT32 st_lspare;
- INT64 st_qspare[2];
-};
-
-struct sockaddr {
- __uint8_t sa_len; /* total length */
- sa_family_t sa_family; /* address family */
- char sa_data[14]; /* actually longer; address value */
-};
-
-//
-// Externs from EFI Application Toolkit required to build Open SSL
-//
-extern int errno;
-
-//
-// Function prototypes from EFI Application Toolkit required to build Open SSL
-//
-void *malloc (size_t);
-void *realloc (void *, size_t);
-void free (void *);
-int isdigit (int);
-int isspace (int);
-int tolower (int);
-int isupper (int);
-int isxdigit (int);
-int isalnum (int);
-void *memcpy (void *, const void *, size_t);
-void *memset (void *, int, size_t);
-void *memchr (const void *, int, size_t);
-int memcmp (const void *, const void *, size_t);
-void *memmove (void *, const void *, size_t);
-int strcmp (const char *, const char *);
-int strncmp (const char *, const char *, size_t);
-char *strcpy (char *, const char *);
-char *strncpy (char *, const char *, size_t);
-size_t strlen (const char *);
-char *strcat (char *, const char *);
-char *strchr (const char *, int);
-int strcasecmp (const char *, const char *);
-int strncasecmp (const char *, const char *, size_t);
-char *strncpy (char *, const char *, size_t);
-int strncmp (const char *, const char *, size_t);
-char *strrchr (const char *, int);
-unsigned long strtoul (const char *, char **, int);
-long strtol (const char *, char **, int);
-char *strerror (int);
-size_t strspn (const char *, const char *);
-size_t strcspn (const char *, const char *);
-int printf (const char *, ...);
-int sscanf (const char *, const char *, ...);
-int open (const char *, int, ...);
-int chmod (const char *, mode_t);
-int stat (const char *, struct stat *);
-off_t lseek (int, off_t, int);
-ssize_t read (int, void *, size_t);
-ssize_t write (int, const void *, size_t);
-int close (int);
-FILE *fopen (const char *, const char *);
-size_t fread (void *, size_t, size_t, FILE *);
-size_t fwrite (const void *, size_t, size_t, FILE *);
-char *fgets (char *, int, FILE *);
-int fputs (const char *, FILE *);
-int fprintf (FILE *, const char *, ...);
-int vfprintf (FILE *, const char *, VA_LIST);
-int fflush (FILE *);
-int fclose (FILE *);
-DIR *opendir (const char *);
-struct dirent *readdir (DIR *);
-int closedir (DIR *);
-void openlog (const char *, int, int);
-void closelog (void);
-void syslog (int, const char *, ...);
-time_t time (time_t *);
-struct tm *localtime (const time_t *);
-struct tm *gmtime (const time_t *);
-struct tm *gmtime_r (const time_t *, struct tm *);
-uid_t getuid (void);
-uid_t geteuid (void);
-gid_t getgid (void);
-gid_t getegid (void);
-void qsort (void *, size_t, size_t, int (*)(const void *, const void *));
-char *getenv (const char *);
-void exit (int);
-void abort (void);
-__sighandler_t *signal (int, __sighandler_t *);
-
-//
-// Global variables from EFI Application Toolkit required to build Open SSL
-//
-extern FILE *stderr;
-extern FILE *stdin;
-extern FILE *stdout;
-
-//
-// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
-//
-#define memcpy(dest,source,count) CopyMem(dest,source,(UINTN)(count))
-#define memset(dest,ch,count) SetMem(dest,(UINTN)(count),(UINT8)(ch))
-#define memchr(buf,ch,count) ScanMem8(buf,(UINTN)(count),(UINT8)ch)
-#define memcmp(buf1,buf2,count) (int)(CompareMem(buf1,buf2,(UINTN)(count)))
-#define memmove(dest,source,count) CopyMem(dest,source,(UINTN)(count))
-#define strncmp(string1,string2,count) (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))
-#define strcpy(strDest,strSource) AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)
-#define strncpy(strDest,strSource,count) AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)
-#define strlen(str) (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE))
-#define strcat(strDest,strSource) AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource)
-#define strchr(str,ch) ScanMem8((VOID *)(str),AsciiStrSize(str),(UINT8)ch)
-#define abort() ASSERT (FALSE)
-#define assert(expression)
-#define localtime(timer) NULL
-#define gmtime_r(timer,result) (result = NULL)
-#define atoi(nptr) AsciiStrDecimalToUintn(nptr)
-#define gettimeofday(tvp,tz) do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)
-
-#endif
diff --git a/CryptoPkg/Include/arpa/inet.h b/CryptoPkg/Include/arpa/inet.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/arpa/inet.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/assert.h b/CryptoPkg/Include/assert.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/assert.h
+++ b/CryptoPkg/Include/assert.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/ctype.h b/CryptoPkg/Include/ctype.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/ctype.h
+++ b/CryptoPkg/Include/ctype.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/dirent.h b/CryptoPkg/Include/dirent.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/dirent.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/errno.h b/CryptoPkg/Include/errno.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/errno.h
+++ b/CryptoPkg/Include/errno.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/limits.h b/CryptoPkg/Include/limits.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/limits.h
+++ b/CryptoPkg/Include/limits.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/malloc.h b/CryptoPkg/Include/malloc.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/malloc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/math.h b/CryptoPkg/Include/math.h
deleted file mode 100644
index a21f5543cd..0000000000
--- a/CryptoPkg/Include/math.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OPEN SSL
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/memory.h b/CryptoPkg/Include/memory.h
index 092b3cde1f..1a8d1c47de 100644
--- a/CryptoPkg/Include/memory.h
+++ b/CryptoPkg/Include/memory.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/netdb.h b/CryptoPkg/Include/netdb.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/netdb.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/netinet/in.h b/CryptoPkg/Include/netinet/in.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/netinet/in.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/sgtty.h b/CryptoPkg/Include/sgtty.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/sgtty.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/signal.h b/CryptoPkg/Include/signal.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/signal.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/stdarg.h b/CryptoPkg/Include/stdarg.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/stdarg.h
+++ b/CryptoPkg/Include/stdarg.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/stddef.h b/CryptoPkg/Include/stddef.h
index 8dfc36ffb0..1a8d1c47de 100644
--- a/CryptoPkg/Include/stddef.h
+++ b/CryptoPkg/Include/stddef.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/stdio.h b/CryptoPkg/Include/stdio.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/stdio.h
+++ b/CryptoPkg/Include/stdio.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/stdlib.h b/CryptoPkg/Include/stdlib.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/stdlib.h
+++ b/CryptoPkg/Include/stdlib.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/string.h b/CryptoPkg/Include/string.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/string.h
+++ b/CryptoPkg/Include/string.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/strings.h b/CryptoPkg/Include/strings.h
index 8dfc36ffb0..1a8d1c47de 100644
--- a/CryptoPkg/Include/strings.h
+++ b/CryptoPkg/Include/strings.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/sys/ioctl.h b/CryptoPkg/Include/sys/ioctl.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/sys/ioctl.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/sys/param.h b/CryptoPkg/Include/sys/param.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/sys/param.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/sys/socket.h b/CryptoPkg/Include/sys/socket.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/sys/socket.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/sys/stat.h b/CryptoPkg/Include/sys/stat.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/sys/stat.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/sys/time.h b/CryptoPkg/Include/sys/time.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/sys/time.h
+++ b/CryptoPkg/Include/sys/time.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/sys/times.h b/CryptoPkg/Include/sys/times.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/sys/times.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/sys/types.h b/CryptoPkg/Include/sys/types.h
index ee07f6bcb5..1a8d1c47de 100644
--- a/CryptoPkg/Include/sys/types.h
+++ b/CryptoPkg/Include/sys/types.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,5 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
-
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/sys/un.h b/CryptoPkg/Include/sys/un.h
deleted file mode 100644
index ee07f6bcb5..0000000000
--- a/CryptoPkg/Include/sys/un.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
- Include file to support building OpenSSL Crypto Library.
-
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
diff --git a/CryptoPkg/Include/syslog.h b/CryptoPkg/Include/syslog.h
index 8dfc36ffb0..1a8d1c47de 100644
--- a/CryptoPkg/Include/syslog.h
+++ b/CryptoPkg/Include/syslog.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/time.h b/CryptoPkg/Include/time.h
index 8dfc36ffb0..1a8d1c47de 100644
--- a/CryptoPkg/Include/time.h
+++ b/CryptoPkg/Include/time.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Include/unistd.h b/CryptoPkg/Include/unistd.h
index 8dfc36ffb0..1a8d1c47de 100644
--- a/CryptoPkg/Include/unistd.h
+++ b/CryptoPkg/Include/unistd.h
@@ -1,7 +1,7 @@
/** @file
- Include file to support building OpenSSL Crypto Library.
+ Include file to support building the third-party cryptographic library.
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
diff --git a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
index 92cc963038..4f9f308a7d 100644
--- a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
+++ b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
@@ -1,7 +1,7 @@
/** @file
Internal include file for BaseCryptLib.
-Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/DebugLib.h>
#include <Library/BaseCryptLib.h>
-#include "OpenSslSupport.h"
+#include "CrtLibSupport.h"
#include <openssl/opensslv.h>
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
index 964545f143..f390e0d449 100644
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
@@ -2,7 +2,7 @@
Base Memory Allocation Routines Wrapper for Crypto library over OpenSSL
during PEI & DXE phases.
-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -13,7 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
+#include <Library/MemoryAllocationLib.h>
//
// -- Memory-Allocation Routines --
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c b/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
index 0a19a69533..7f20164999 100644
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
@@ -12,7 +12,7 @@
5) DhGenerateParameter
6) DhGenerateKey
-Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
//
// -- Time Management Routines --
@@ -38,4 +38,4 @@ time_t time (time_t *timer)
struct tm * gmtime (const time_t *timer)
{
return NULL;
-}
\ No newline at end of file
+}
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
index a2386bc073..20c96563d2 100644
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
@@ -2,7 +2,7 @@
C Run-Time Libraries (CRT) Wrapper Implementation for OpenSSL-based
Cryptographic Library.
-Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
int errno = 0;
@@ -136,6 +136,30 @@ char *strrchr (const char *str, int c)
}
}
+/* Compare first n bytes of string s1 with string s2, ignoring case */
+int strncasecmp (const char *s1, const char *s2, size_t n)
+{
+ int Val;
+
+ ASSERT(s1 != NULL);
+ ASSERT(s2 != NULL);
+
+ if (n != 0) {
+ do {
+ Val = tolower(*s1) - tolower(*s2);
+ if (Val != 0) {
+ return Val;
+ }
+ ++s1;
+ ++s2;
+ if (*s1 == '\0') {
+ break;
+ }
+ } while (--n != 0);
+ }
+ return 0;
+}
+
/* Read formatted data from a string */
int sscanf (const char *buffer, const char *format, ...)
{
@@ -146,6 +170,70 @@ int sscanf (const char *buffer, const char *format, ...)
return 0;
}
+/* Maps errnum to an error-message string */
+char * strerror (int errnum)
+{
+ return NULL;
+}
+
+/* Computes the length of the maximum initial segment of the string pointed to by s1
+ which consists entirely of characters from the string pointed to by s2. */
+size_t strspn (const char *s1 , const char *s2)
+{
+ UINT8 Map[32];
+ UINT32 Index;
+ size_t Count;
+
+ for (Index = 0; Index < 32; Index++) {
+ Map[Index] = 0;
+ }
+
+ while (*s2) {
+ Map[*s2 >> 3] |= (1 << (*s2 & 7));
+ s2++;
+ }
+
+ if (*s1) {
+ Count = 0;
+ while (Map[*s1 >> 3] & (1 << (*s1 & 7))) {
+ Count++;
+ s1++;
+ }
+
+ return Count;
+ }
+
+ return 0;
+}
+
+/* Computes the length of the maximum initial segment of the string pointed to by s1
+ which consists entirely of characters not from the string pointed to by s2. */
+size_t strcspn (const char *s1, const char *s2)
+{
+ UINT8 Map[32];
+ UINT32 Index;
+ size_t Count;
+
+ for (Index = 0; Index < 32; Index++) {
+ Map[Index] = 0;
+ }
+
+ while (*s2) {
+ Map[*s2 >> 3] |= (1 << (*s2 & 7));
+ s2++;
+ }
+
+ Map[0] |= 1;
+
+ Count = 0;
+ while (!(Map[*s1 >> 3] & (1 << (*s1 & 7)))) {
+ Count ++;
+ s1++;
+ }
+
+ return Count;
+}
+
//
// -- Character Classification Routines --
//
@@ -277,12 +365,6 @@ char *getenv (const char *varname)
// -- Stream I/O Routines --
//
-/* Write formatted output using a pointer to a list of arguments */
-int vfprintf (FILE *stream, const char *format, VA_LIST arg)
-{
- return 0;
-}
-
/* Write data to a stream */
size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
{
@@ -303,36 +385,6 @@ int BIO_snprintf(char *buf, size_t n, const char *format, ...)
return 0;
}
-void *UI_OpenSSL(void)
-{
- return NULL;
-}
-
-int X509_load_cert_file (VOID *ctx, const char *file, int type)
-{
- return 0;
-}
-
-int X509_load_crl_file (VOID *ctx, const char *file, int type)
-{
- return 0;
-}
-
-int chmod (const char *c, mode_t m)
-{
- return -1;
-}
-
-int close (int f)
-{
- return -1;
-}
-
-void closelog (void)
-{
-
-}
-
#ifdef __GNUC__
typedef
@@ -341,7 +393,6 @@ VOID
VOID
) __attribute__((__noreturn__));
-
STATIC
VOID
EFIAPI
@@ -351,8 +402,7 @@ NopFunction (
{
}
-
-void exit (int e)
+void abort (void)
{
NoReturnFuncPtr NoReturnFunc;
@@ -363,8 +413,9 @@ void exit (int e)
#else
-void exit (int e)
+void abort (void)
{
+ // Do nothing
}
#endif
@@ -384,16 +435,6 @@ size_t fread (void *b, size_t c, size_t i, FILE *f)
return 0;
}
-int fputs (const char *s, FILE *f)
-{
- return 0;
-}
-
-int fprintf (FILE *f, const char *s, ...)
-{
- return 0;
-}
-
uid_t getuid (void)
{
return 0;
@@ -414,46 +455,6 @@ gid_t getegid (void)
return 0;
}
-off_t lseek (int a, off_t o, int d)
-{
- return 0;
-}
-
-void openlog (const char *c, int a, int b)
-{
-
-}
-
-ssize_t read (int f, void *b, size_t c)
-{
- return 0;
-}
-
-int stat (const char *c, struct stat *s)
-{
- return -1;
-}
-
-int strcasecmp (const char *c, const char *s)
-{
- return 0;
-}
-
-int strncasecmp (const char *c, const char *s, size_t l)
-{
- return 0;
-}
-
-void syslog (int a, const char *c, ...)
-{
-
-}
-
-ssize_t write (int f, const void *b, size_t l)
-{
- return 0;
-}
-
int printf (char const *fmt, ...)
{
return 0;
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/HelperWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/HelperWrapper.c
deleted file mode 100644
index bf4399ca08..0000000000
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/HelperWrapper.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/** @file
- Wrapper Implementation of Helper Routines produced by the C Compiler
- for the OpenSSL-based Cryptographic Library.
-
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <OpenSslSupport.h>
-
-//---------------------------------------------------------
-// Helper Routines Wrapper
-//---------------------------------------------------------
-
-/* Divides a 64-bit signed value with a 64-bit signed value and returns
- a 64-bit signed quotient and reminder */
-void _aulldvrm ()
-{
- //
- // Null _aulldvrm() Math function implementation to satisfy the linker, since
- // there is no direct functionality logic dependency in present UEFI cases.
- //
- return;
-}
-
-
-/* Converts a scalar double-precision floating point value to a 32-bit integer */
-long _ftol2_sse (double dblSource)
-{
- //
- // OpenSSL uses this function due to using floating-point inside it.
- // It is only present in 32-bit versions of the compiler.
- // Null _ftol2_sse() function implementation to satisfy the linker, since
- // there is no direct functionality logic dependency in present UEFI cases.
- //
- return 0;
-}
-
-/* Converts a scalar double-precision floating point value to a 32-bit integer */
-long _ftol2 (double dblSource)
-{
- //
- // Null _ftol2() function implementation to satisfy the linker, since
- // there is no direct functionality logic dependency in present UEFI cases.
- //
- return 0;
-}
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
index feaa37145e..463f2bf855 100644
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
@@ -13,9 +13,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeLib.h>
+#include <Library/MemoryAllocationLib.h>
#include <Guid/EventGroup.h>
//----------------------------------------------------------------
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
index 93e487dcef..581b8fb028 100644
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
@@ -2,7 +2,7 @@
C Run-Time Libraries (CRT) Time Management Routines Wrapper Implementation
for OpenSSL-based Cryptographic Library (used in DXE & RUNTIME).
-Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <Uefi.h>
-#include <OpenSslSupport.h>
+#include <CrtLibSupport.h>
#include <Library/UefiRuntimeServicesTableLib.h>
//
--
2.11.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
On 03/23/17 14:19, Qin Long wrote: > Cleaning-up CRT Library Wrapper for the third-party cryptography > library building. The changes includes > 1. Rename OpenSslSupport.h to CrtLibSupport.h for future alternative > crypto provider support. > 2. Remove all un-referenced CRT APIs and headers. > > (NOTE: More cleans-up could be possible after OpenSSL integrate the > extra PR request: https://github.com/openssl/openssl/pull/2961) > > Cc: Ting Ye <ting.ye@intel.com> > Cc: Laszlo Ersek <lersek@redhat.com> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Cc: Gary Lin <glin@suse.com> > Cc: Ronald Cron <ronald.cron@arm.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Qin Long <qin.long@intel.com> > --- > CryptoPkg/Include/CrtLibSupport.h | 193 ++++++++++++++ > CryptoPkg/Include/OpenSslSupport.h | 292 --------------------- > CryptoPkg/Include/arpa/inet.h | 16 -- > CryptoPkg/Include/assert.h | 7 +- > CryptoPkg/Include/ctype.h | 7 +- > CryptoPkg/Include/dirent.h | 16 -- > CryptoPkg/Include/errno.h | 7 +- > CryptoPkg/Include/limits.h | 7 +- > CryptoPkg/Include/malloc.h | 16 -- > CryptoPkg/Include/math.h | 16 -- > CryptoPkg/Include/memory.h | 7 +- > CryptoPkg/Include/netdb.h | 16 -- > CryptoPkg/Include/netinet/in.h | 16 -- > CryptoPkg/Include/sgtty.h | 16 -- > CryptoPkg/Include/signal.h | 16 -- > CryptoPkg/Include/stdarg.h | 7 +- > CryptoPkg/Include/stddef.h | 6 +- > CryptoPkg/Include/stdio.h | 7 +- > CryptoPkg/Include/stdlib.h | 7 +- > CryptoPkg/Include/string.h | 7 +- > CryptoPkg/Include/strings.h | 6 +- > CryptoPkg/Include/sys/ioctl.h | 16 -- > CryptoPkg/Include/sys/param.h | 16 -- > CryptoPkg/Include/sys/socket.h | 16 -- > CryptoPkg/Include/sys/stat.h | 16 -- > CryptoPkg/Include/sys/time.h | 7 +- > CryptoPkg/Include/sys/times.h | 16 -- > CryptoPkg/Include/sys/types.h | 7 +- > CryptoPkg/Include/sys/un.h | 16 -- > CryptoPkg/Include/syslog.h | 6 +- > CryptoPkg/Include/time.h | 6 +- > CryptoPkg/Include/unistd.h | 6 +- > CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h | 4 +- > .../BaseCryptLib/SysCall/BaseMemAllocation.c | 5 +- > .../BaseCryptLib/SysCall/ConstantTimeClock.c | 6 +- > .../Library/BaseCryptLib/SysCall/CrtWrapper.c | 185 ++++++------- > .../Library/BaseCryptLib/SysCall/HelperWrapper.c | 54 ---- > .../BaseCryptLib/SysCall/RuntimeMemAllocation.c | 3 +- > .../Library/BaseCryptLib/SysCall/TimerWrapper.c | 4 +- > 39 files changed, 346 insertions(+), 731 deletions(-) > create mode 100644 CryptoPkg/Include/CrtLibSupport.h > delete mode 100644 CryptoPkg/Include/OpenSslSupport.h > delete mode 100644 CryptoPkg/Include/arpa/inet.h > delete mode 100644 CryptoPkg/Include/dirent.h > delete mode 100644 CryptoPkg/Include/malloc.h > delete mode 100644 CryptoPkg/Include/math.h > delete mode 100644 CryptoPkg/Include/netdb.h > delete mode 100644 CryptoPkg/Include/netinet/in.h > delete mode 100644 CryptoPkg/Include/sgtty.h > delete mode 100644 CryptoPkg/Include/signal.h > delete mode 100644 CryptoPkg/Include/sys/ioctl.h > delete mode 100644 CryptoPkg/Include/sys/param.h > delete mode 100644 CryptoPkg/Include/sys/socket.h > delete mode 100644 CryptoPkg/Include/sys/stat.h > delete mode 100644 CryptoPkg/Include/sys/times.h > delete mode 100644 CryptoPkg/Include/sys/un.h > delete mode 100644 CryptoPkg/Library/BaseCryptLib/SysCall/HelperWrapper.c Tested-by: Laszlo Ersek <lersek@redhat.com> (Tested as described in <http://mid.mail-archive.com/4410fa53-b0e4-d64a-7b95-8a430a4c7b06@redhat.com>.) Thanks! Laszlo _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On Thu, Mar 23, 2017 at 09:19:28PM +0800, Qin Long wrote: > Cleaning-up CRT Library Wrapper for the third-party cryptography > library building. The changes includes > 1. Rename OpenSslSupport.h to CrtLibSupport.h for future alternative > crypto provider support. > 2. Remove all un-referenced CRT APIs and headers. > > (NOTE: More cleans-up could be possible after OpenSSL integrate the > extra PR request: https://github.com/openssl/openssl/pull/2961) > > Cc: Ting Ye <ting.ye@intel.com> > Cc: Laszlo Ersek <lersek@redhat.com> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Cc: Gary Lin <glin@suse.com> > Cc: Ronald Cron <ronald.cron@arm.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Qin Long <qin.long@intel.com> > --- I tested OVMF and it works for me. Tested-by: Gary Lin <glin@suse.com> Gary Lin _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Qin,
this patch (commit fc9fa685d689c) seems to break *some* GCC builds:
On 03/23/17 14:19, Qin Long wrote:
[snip]
> +/* Compare first n bytes of string s1 with string s2, ignoring case */
> +int strncasecmp (const char *s1, const char *s2, size_t n)
> +{
> + int Val;
> +
> + ASSERT(s1 != NULL);
> + ASSERT(s2 != NULL);
Here. The error messages are:
CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c: In function 'strncasecmp':
MdePkg/Include/Library/DebugLib.h:292:12: error: nonnull argument 's1' compared to NULL [-Werror=nonnull-compare]
if (!(Expression)) { \
^
CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c:144:3: note: in expansion of macro 'ASSERT'
ASSERT(s1 != NULL);
^~~~~~
MdePkg/Include/Library/DebugLib.h:292:12: error: nonnull argument 's2' compared to NULL [-Werror=nonnull-compare]
if (!(Expression)) { \
^
CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c:145:3: note: in expansion of macro 'ASSERT'
ASSERT(s2 != NULL);
^~~~~~
The GCC documentation <https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html> says,
-Wnonnull-compare
Warn when comparing an argument marked with the nonnull function attribute against null inside the function.
-Wnonnull-compare is included in -Wall. It can be disabled with the -Wno-nonnull-compare option.
I have no idea where the compiler thinks "s1" and "s2" are marked as non-null. I grepped the tree for "nonnull" and there are no hits.
Gerd, what compiler are you using? (From your logs, it looks like OVMF is being built for IA32, with the GCC49 tool chain settings.)
Thanks
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Laszlo,
Thanks for catching this.
I was using GCC5 toolchain for few validations, the build looks OK.
Yes, should have more toolchain validations. :-(
I am also confused about this nonull warning. Maybe strncasecmp function
could have been defined as the different prototype (explicitely or implicitely):
int strcasecmp(const char *s1, const char *s2) __attribute__((nonnull));
And there was also one extra build warning (on openssl source) under GCC48.
Let me dig more and provide possible fixes to address this later.
Best Regards & Thanks,
LONG, Qin
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Laszlo Ersek
> Sent: Friday, March 31, 2017 1:34 AM
> To: Long, Qin; edk2-devel@lists.01.org; Gerd Hoffmann
> Cc: Ye, Ting; ronald.cron@arm.com; Wu, Jiaxin; glin@suse.com;
> ard.biesheuvel@linaro.org
> Subject: Re: [edk2] [PATCH v2 07/11] CryptoPkg: Clean-up CRT Library
> Wrapper.
>
> Qin,
>
> this patch (commit fc9fa685d689c) seems to break *some* GCC builds:
>
> On 03/23/17 14:19, Qin Long wrote:
>
> [snip]
>
> > +/* Compare first n bytes of string s1 with string s2, ignoring case
> > +*/ int strncasecmp (const char *s1, const char *s2, size_t n) {
> > + int Val;
> > +
> > + ASSERT(s1 != NULL);
> > + ASSERT(s2 != NULL);
>
> Here. The error messages are:
>
> CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c: In function
> 'strncasecmp':
> MdePkg/Include/Library/DebugLib.h:292:12: error: nonnull argument 's1'
> compared to NULL [-Werror=nonnull-compare]
> if (!(Expression)) { \
> ^
> CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c:144:3: note: in
> expansion of macro 'ASSERT'
> ASSERT(s1 != NULL);
> ^~~~~~
> MdePkg/Include/Library/DebugLib.h:292:12: error: nonnull argument 's2'
> compared to NULL [-Werror=nonnull-compare]
> if (!(Expression)) { \
> ^
> CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c:145:3: note: in
> expansion of macro 'ASSERT'
> ASSERT(s2 != NULL);
> ^~~~~~
>
> The GCC documentation <https://gcc.gnu.org/onlinedocs/gcc/Warning-
> Options.html> says,
>
> -Wnonnull-compare
>
> Warn when comparing an argument marked with the nonnull function
> attribute against null inside the function.
>
> -Wnonnull-compare is included in -Wall. It can be disabled with the -Wno-
> nonnull-compare option.
>
> I have no idea where the compiler thinks "s1" and "s2" are marked as non-
> null. I grepped the tree for "nonnull" and there are no hits.
>
> Gerd, what compiler are you using? (From your logs, it looks like OVMF is
> being built for IA32, with the GCC49 tool chain settings.)
>
> Thanks
> Laszlo
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.