diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-11-22 10:48:42 +0100 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-11-22 10:48:42 +0100 |
| commit | 6280b248e57fa54bcd197edd6491962c9fc0e772 (patch) | |
| tree | f10d2b08ebbeb728cca635db3bbe9a02a50ee59d /lib/freebl/Makefile | |
| parent | f1e4cf61ccfd7c26ffb9c318d1b010e5493e8fbd (diff) | |
| download | nss-hg-6280b248e57fa54bcd197edd6491962c9fc0e772.tar.gz | |
Bug 1383369 - formally verified code from HaCl* for Chacha20 (non-vectorized), r=ttaubert,beurdouche
Differential Revision: https://phabricator.services.mozilla.com/D272
Diffstat (limited to 'lib/freebl/Makefile')
| -rw-r--r-- | lib/freebl/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile index 41332f202..61e2ed21c 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile @@ -524,12 +524,14 @@ ifndef NSS_DISABLE_CHACHAPOLY ifneq (1,$(CC_IS_GCC)) EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c else EXTRA_SRCS += chacha20_vec.c endif else EXTRA_SRCS += poly1305.c EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c endif # x86_64 endif # NSS_DISABLE_CHACHAPOLY @@ -590,11 +592,6 @@ ECL_OBJS += $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(ECL_USERS:.c=$(OBJ_SUFFIX))) $(ECL_OBJS): $(ECL_HDRS) -VERIFIED_OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(VERIFIED_SRCS:.c=$(OBJ_SUFFIX))) - -$(VERIFIED_OBJS): $(VERIFIED_HDRS) - - $(OBJDIR)/sysrand$(OBJ_SUFFIX): sysrand.c unix_rand.c win_rand.c $(OBJDIR)/$(PROG_PREFIX)mpprime$(OBJ_SUFFIX): primes.c |