summaryrefslogtreecommitdiff
path: root/Cryptlib
diff options
context:
space:
mode:
Diffstat (limited to 'Cryptlib')
-rw-r--r--Cryptlib/Include/OpenSslSupport.h13
-rw-r--r--Cryptlib/Include/ctype.h16
-rw-r--r--Cryptlib/Include/openssl/crypto.h1
-rw-r--r--Cryptlib/Include/stdarg.h16
-rw-r--r--Cryptlib/Include/stddef.h15
-rw-r--r--Cryptlib/Include/stdlib.h16
-rw-r--r--Cryptlib/Include/string.h16
-rw-r--r--Cryptlib/Include/strings.h15
-rw-r--r--Cryptlib/InternalCryptLib.h2
-rw-r--r--Cryptlib/Makefile14
-rw-r--r--Cryptlib/OpenSSL/Makefile16
-rw-r--r--Cryptlib/OpenSSL/crypto/bio/b_print.c8
12 files changed, 36 insertions, 112 deletions
diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h
index 0b555271..7af9650f 100644
--- a/Cryptlib/Include/OpenSslSupport.h
+++ b/Cryptlib/Include/OpenSslSupport.h
@@ -15,6 +15,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef __OPEN_SSL_SUPPORT_H__
#define __OPEN_SSL_SUPPORT_H__
+/*
+ * Include stddef.h to avoid redefining "offsetof"
+ */
+#include <stddef.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <string.h>
+
#include <efi.h>
#include <efilib.h>
#include "Base.h"
@@ -23,11 +31,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "Library/MemoryAllocationLib.h"
#include "Library/DebugLib.h"
-/*
- * Include stddef.h to avoid redefining "offsetof"
- */
-#include <stddef.h>
-
#define CONST const
//
diff --git a/Cryptlib/Include/ctype.h b/Cryptlib/Include/ctype.h
deleted file mode 100644
index ee07f6bc..00000000
--- a/Cryptlib/Include/ctype.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/Cryptlib/Include/openssl/crypto.h b/Cryptlib/Include/openssl/crypto.h
index bea4ca19..e201a123 100644
--- a/Cryptlib/Include/openssl/crypto.h
+++ b/Cryptlib/Include/openssl/crypto.h
@@ -117,6 +117,7 @@
#ifndef HEADER_CRYPTO_H
# define HEADER_CRYPTO_H
+# include <string.h>
# include <stdlib.h>
# include <openssl/e_os2.h>
diff --git a/Cryptlib/Include/stdarg.h b/Cryptlib/Include/stdarg.h
deleted file mode 100644
index ee07f6bc..00000000
--- a/Cryptlib/Include/stdarg.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/Cryptlib/Include/stddef.h b/Cryptlib/Include/stddef.h
deleted file mode 100644
index 8dfc36ff..00000000
--- a/Cryptlib/Include/stddef.h
+++ /dev/null
@@ -1,15 +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/Cryptlib/Include/stdlib.h b/Cryptlib/Include/stdlib.h
deleted file mode 100644
index ee07f6bc..00000000
--- a/Cryptlib/Include/stdlib.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/Cryptlib/Include/string.h b/Cryptlib/Include/string.h
deleted file mode 100644
index ee07f6bc..00000000
--- a/Cryptlib/Include/string.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/Cryptlib/Include/strings.h b/Cryptlib/Include/strings.h
deleted file mode 100644
index 8dfc36ff..00000000
--- a/Cryptlib/Include/strings.h
+++ /dev/null
@@ -1,15 +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/Cryptlib/InternalCryptLib.h b/Cryptlib/InternalCryptLib.h
index e9a4c20a..dc1a95e6 100644
--- a/Cryptlib/InternalCryptLib.h
+++ b/Cryptlib/InternalCryptLib.h
@@ -15,6 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef __INTERNAL_CRYPT_LIB_H__
#define __INTERNAL_CRYPT_LIB_H__
+#include <stdarg.h>
+
#include "Library/BaseLib.h"
#include "Library/BaseMemoryLib.h"
#include "Library/MemoryAllocationLib.h"
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
index bc5681c5..65a3918c 100644
--- a/Cryptlib/Makefile
+++ b/Cryptlib/Makefile
@@ -2,8 +2,14 @@ ifneq ($(CCACHE_DISABLE),)
export CCACHE_DISABLE
endif
-INCLUDES = -I$(TOPDIR) -iquote $(TOPDIR) -I$(TOPDIR)/Include \
- $(EFI_INCLUDES) -I$(shell $(CC) -print-file-name=include)
+CRYPTDIR = $(TOPDIR)/Cryptlib
+
+FEATUREFLAGS += -nostdinc
+
+INCLUDES = -I$(CRYPTDIR) -I$(CRYPTDIR)/Include \
+ $(EFI_INCLUDES) \
+ -isystem $(TOPDIR)/include/system \
+ -isystem $(shell $(CC) -print-file-name=include)
CFLAGS = $(FEATUREFLAGS) \
$(OPTIMIZATIONS) \
@@ -15,12 +21,12 @@ CFLAGS = $(FEATUREFLAGS) \
CLANG_BUGS = $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,)
ifeq ($(ARCH),x86_64)
-FEATUREFLAGS += -m64 -mno-mmx -mno-sse -mno-red-zone -nostdinc $(CLANG_BUGS)
+FEATUREFLAGS += -m64 -mno-mmx -mno-sse -mno-red-zone $(CLANG_BUGS)
DEFINES += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI \
-DNO_BUILTIN_VA_FUNCS -DMDE_CPU_X64
endif
ifeq ($(ARCH),ia32)
-FEATUREFLAGS += -m32 -mno-mmx -mno-sse -mno-red-zone -nostdinc $(CLANG_BUGS)
+FEATUREFLAGS += -m32 -mno-mmx -mno-sse -mno-red-zone $(CLANG_BUGS)
DEFINES += -DMDE_CPU_IA32
endif
ifeq ($(ARCH),aarch64)
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 5bd72481..294e889a 100644
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -2,17 +2,23 @@ ifneq ($(CCACHE_DISABLE),)
export CCACHE_DISABLE
endif
+CRYPTDIR = $(TOPDIR)/Cryptlib
+OSSLDIR = $(TOPDIR)/Cryptlib/OpenSSL
+
DEFINES = -DL_ENDIAN \
-D_CRT_SECURE_NO_DEPRECATE \
-D_CRT_NONSTDC_NO_DEPRECATE \
-DOPENSSL_SMALL_FOOTPRINT \
-DPEDANTIC
-INCLUDES = -I$(TOPDIR) -I$(TOPDIR)/.. -I$(TOPDIR)/../Include/ -I$(TOPDIR)/crypto \
- -I$(shell $(CC) -print-file-name=include) \
- -I$(TOPDIR)/../Include $(EFI_INCLUDES) \
- -I$(TOPDIR)/crypto/asn1 -I$(TOPDIR)/crypto/evp \
- -I$(TOPDIR)/crypto/modes -I$(TOPDIR)/crypto/include
+INCLUDES = -I$(OSSLDIR) -I$(CRYPTDIR) -I$(OSSLDIR)/Include/ \
+ -I$(OSSLDIR)/crypto -I$(CRYPTDIR)/Include $(EFI_INCLUDES) \
+ -I$(OSSLDIR)/crypto/asn1 -I$(OSSLDIR)/crypto/evp \
+ -I$(OSSLDIR)/crypto/modes -I$(OSSLDIR)/crypto/include \
+ -isystem $(TOPDIR)/include/system \
+ -isystem $(shell $(CC) -print-file-name=include)
+
+FEATUREFLAGS += -nostdinc
WERRFLAGS += -Wno-error=discarded-qualifiers \
-Wno-error=maybe-uninitialized \
diff --git a/Cryptlib/OpenSSL/crypto/bio/b_print.c b/Cryptlib/OpenSSL/crypto/bio/b_print.c
index fea73864..2d303ee8 100644
--- a/Cryptlib/OpenSSL/crypto/bio/b_print.c
+++ b/Cryptlib/OpenSSL/crypto/bio/b_print.c
@@ -134,9 +134,9 @@ static int fmtfp(char **, char **, size_t *, size_t *,
LDOUBLE, int, int, int);
#endif
static int doapr_outch(char **, char **, size_t *, size_t *, int);
-static int _dopr(char **sbuffer, char **buffer,
- size_t *maxlen, size_t *retlen, int *truncated,
- const char *format, va_list args);
+static int EFIAPI _dopr(char **sbuffer, char **buffer,
+ size_t *maxlen, size_t *retlen, int *truncated,
+ const char *format, va_list args);
/* format read states */
#define DP_S_DEFAULT 0
@@ -167,7 +167,7 @@ static int _dopr(char **sbuffer, char **buffer,
#define char_to_int(p) (p - '0')
#define OSSL_MAX(p,q) ((p >= q) ? p : q)
-static int
+static int EFIAPI
_dopr(char **sbuffer,
char **buffer,
size_t *maxlen,
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-26 01:56:59 +0000