projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fips_canister.c: fix typo.
[openssl.git]
/
Makefile.fips
diff --git
a/Makefile.fips
b/Makefile.fips
index cfe7d1bed056bdcd7292e02aac2ebe29992e42ec..53bb609d58666f019c2ab8cd4df9df568ad47700 100644
(file)
--- a/
Makefile.fips
+++ b/
Makefile.fips
@@
-186,7
+186,7
@@
SHARED_LDFLAGS=
GENERAL= Makefile
BASENAME= openssl
NAME= $(BASENAME)-$(VERSION)
GENERAL= Makefile
BASENAME= openssl
NAME= $(BASENAME)-$(VERSION)
-TARFILE= openssl-fips-
test-2.0
.tar
+TARFILE= openssl-fips-
2.0-test
.tar
WTARFILE= $(NAME)-win.tar
EXHEADER= e_os2.h
HEADER= e_os.h
WTARFILE= $(NAME)-win.tar
EXHEADER= e_os2.h
HEADER= e_os.h
@@
-275,8
+275,6
@@
BUILD_ONE_CMD=\
reflect:
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
reflect:
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
-# FIXME
-
FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
../crypto/aes/aes_ecb.o \
../crypto/aes/aes_ofb.o \
FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
../crypto/aes/aes_ecb.o \
../crypto/aes/aes_ofb.o \
@@
-334,10
+332,12
@@
FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
../crypto/evp/m_sha1.o \
../crypto/hmac/hmac.o \
../crypto/modes/cbc128.o \
../crypto/evp/m_sha1.o \
../crypto/hmac/hmac.o \
../crypto/modes/cbc128.o \
+ ../crypto/modes/ccm128.o \
../crypto/modes/cfb128.o \
../crypto/modes/ctr128.o \
../crypto/modes/gcm128.o \
../crypto/modes/ofb128.o \
../crypto/modes/cfb128.o \
../crypto/modes/ctr128.o \
../crypto/modes/gcm128.o \
../crypto/modes/ofb128.o \
+ ../crypto/modes/xts128.o \
../crypto/rsa/rsa_eay.o \
../crypto/rsa/rsa_gen.o \
../crypto/rsa/rsa_crpt.o \
../crypto/rsa/rsa_eay.o \
../crypto/rsa/rsa_gen.o \
../crypto/rsa/rsa_crpt.o \
@@
-487,7
+487,7
@@
openssl.pc: Makefile
echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
-Makefile: Makefile.
org
Configure config
+Makefile: Makefile.
fips
Configure config
@echo "Makefile is older than Makefile.org, Configure or config."
@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
@false
@echo "Makefile is older than Makefile.org, Configure or config."
@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
@false
@@
-519,7
+519,7
@@
links:
@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
@set -e; dir=fips target=links; $(RECURSIVE_BUILD_CMD)
@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
@set -e; dir=fips target=links; $(RECURSIVE_BUILD_CMD)
- @
set -e; dir=crypto target=links; $(RECURSIVE_BUILD_CMD
)
+ @
(cd crypto ; SDIRS='$(LINKDIRS)' $(MAKE) -e links
)
gentests:
@(cd test && echo "generating dummy tests (if needed)..." && \
gentests:
@(cd test && echo "generating dummy tests (if needed)..." && \
@@
-540,7
+540,7
@@
report:
@$(PERL) util/selftest.pl
depend:
@$(PERL) util/selftest.pl
depend:
- @
set -e; target=depend; $(RECURSIVE_BUILD_CMD)
+ @
echo make depend not supported ; false
lint:
@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
lint:
@set -e; target=lint; $(RECURSIVE_BUILD_CMD)