Skip to content

Commit ee9f90d

Browse files
authored
Merge pull request #714 from d06alexandrov/fix_makefile_ipsec
Removed deleted sources from Makefile
2 parents 5423ff8 + 179cc5e commit ee9f90d

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

lib/Makefile

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ ifdef FF_TCPHPTS
127127
CFLAGS+= -DTCPHPTS -DRATELIMIT
128128
endif
129129

130+
ifdef FF_IPSEC
131+
HOST_CFLAGS+= -DIPSEC
132+
CFLAGS+= -DIPSEC
133+
endif
134+
130135
HOST_C= ${CC} -c $(HOST_CFLAGS) ${HOST_INCLUDES} ${WERROR} ${PROF} $<
131136

132137

@@ -270,12 +275,8 @@ FF_HOST_SRCS+= \
270275
endif
271276

272277
ifdef FF_IPSEC
273-
CRYPTO_ASM_SRCS+= \
274-
aesencdec_${MACHINE_CPUARCH}.S \
275-
aeskeys_${MACHINE_CPUARCH}.S
276-
277278
CRYPTO_SRCS+= \
278-
aesni.c \
279+
#aesni.c \
279280
aesni_wrap.c \
280281
bf_ecb.c \
281282
bf_enc.c \
@@ -576,16 +577,6 @@ NETIPFW_SRCS+= \
576577
ip_fw2.c
577578
endif
578579

579-
ifdef FF_IPSEC
580-
NETINET_SRCS+= \
581-
ip_ipsec.c
582-
ifdef FF_INET6
583-
NETINET6_SRCS+= \
584-
ip6_ipsec.c
585-
endif
586-
endif
587-
588-
589580
ifdef FF_IPSEC
590581
NETIPSEC_SRCS+= \
591582
ipsec.c \
@@ -605,13 +596,11 @@ endif
605596

606597
ifdef FF_IPSEC
607598
OPENCRYPTO_SRCS+= \
608-
cast.c \
609599
criov.c \
610600
crypto.c \
611601
cryptosoft.c \
612-
deflate.c \
602+
cryptodeflate.c \
613603
rmd160.c \
614-
skipjack.c \
615604
xform.c
616605
endif
617606

0 commit comments

Comments
 (0)