diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2017-08-07 17:35:43 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2017-08-07 17:35:43 -0400 |
| commit | cd6457d07d545664fe944a7f791770731a93df29 (patch) | |
| tree | af09aaeca401e791178c660aa50aefa2e8d27987 /Cryptlib/Makefile | |
| parent | f51c03c05b4f08d91f4578b4d7f54e88f8d4ab0a (diff) | |
| parent | 25f7fd1fb389a5f6356f353d16c5ead80dac6bbc (diff) | |
| download | efi-boot-shim-cd6457d07d545664fe944a7f791770731a93df29.tar.gz efi-boot-shim-cd6457d07d545664fe944a7f791770731a93df29.zip | |
Merge tag 'upstream/12+1501864225.b586175' into cyphermox/mokmanager
Upstream version 12+1501864225.b586175
Diffstat (limited to 'Cryptlib/Makefile')
| -rw-r--r-- | Cryptlib/Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile index a028979e..a5e02d4d 100644 --- a/Cryptlib/Makefile +++ b/Cryptlib/Makefile @@ -1,7 +1,7 @@ -EFI_INCLUDES = -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol +EFI_INCLUDES = -I$(TOPDIR)/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -CFLAGS = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \ +CFLAGS = -ggdb -O0 -I$(TOPDIR) -iquote $(TOPDIR) -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \ -Wall $(EFI_INCLUDES) -std=gnu89 \ -ffreestanding -I$(shell $(CC) -print-file-name=include) @@ -20,16 +20,17 @@ endif LDFLAGS = -nostdlib -znocombreloc TARGET = libcryptlib.a -OBJS = Hash/CryptMd4.o \ +OBJS = Hash/CryptMd4Null.o \ Hash/CryptMd5.o \ Hash/CryptSha1.o \ Hash/CryptSha256.o \ Hash/CryptSha512.o \ - Hmac/CryptHmacMd5.o \ - Hmac/CryptHmacSha1.o \ - Cipher/CryptAes.o \ - Cipher/CryptTdes.o \ - Cipher/CryptArc4.o \ + Hmac/CryptHmacMd5Null.o \ + Hmac/CryptHmacSha1Null.o \ + Hmac/CryptHmacSha256Null.o \ + Cipher/CryptAesNull.o \ + Cipher/CryptTdesNull.o \ + Cipher/CryptArc4Null.o \ Rand/CryptRand.o \ Pk/CryptRsaBasic.o \ Pk/CryptRsaExtNull.o \ @@ -39,11 +40,12 @@ OBJS = Hash/CryptMd4.o \ Pk/CryptTs.o \ Pk/CryptX509.o \ Pk/CryptAuthenticode.o \ - Pem/CryptPem.o \ + Pem/CryptPemNull.o \ SysCall/CrtWrapper.o \ SysCall/TimerWrapper.o \ SysCall/BaseMemAllocation.o \ - SysCall/BaseStrings.o + SysCall/BaseStrings.o \ + SysCall/memset.o all: $(TARGET) |