summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2017-12-12 15:06:12 +0000
committerDamien Miller <djm@mindrot.org>2017-12-19 15:17:38 +1100
commit012e5cb839faf76549e3b6101b192fe1a74d367e (patch)
tree8144e791fb9e1fc015b29504aaa268f98184149d
parentb35addfb4cd3b5cdb56a2a489d38e940ada926c7 (diff)
downloadopenssh-git-012e5cb839faf76549e3b6101b192fe1a74d367e.tar.gz
upstream commit
Create a persistent umac128.c source file: #define the output size and the name of the entry points for UMAC-128 before including umac.c. Idea from FreeBSD. ok dtucker@ OpenBSD-Commit-ID: 463cfacfa07cb8060a4d4961e63dca307bf3f4b1
-rw-r--r--Makefile.in7
-rw-r--r--umac.c2
-rw-r--r--umac128.c9
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index 25b57987..4b6dfc47 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -218,13 +218,6 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
moduli:
echo
-# special case target for umac128
-umac128.o: umac.c
- $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \
- -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \
- -Dumac_update=umac128_update -Dumac_final=umac128_final \
- -Dumac_delete=umac128_delete -Dumac_ctx=umac128_ctx
-
clean: regressclean
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core survey
diff --git a/umac.c b/umac.c
index b6b256a7..eab83107 100644
--- a/umac.c
+++ b/umac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umac.c,v 1.15 2017/11/28 06:09:38 djm Exp $ */
+/* $OpenBSD: umac.c,v 1.16 2017/12/12 15:06:12 naddy Exp $ */
/* -----------------------------------------------------------------------
*
* umac.c -- C Implementation UMAC Message Authentication
diff --git a/umac128.c b/umac128.c
new file mode 100644
index 00000000..af3bd9d3
--- /dev/null
+++ b/umac128.c
@@ -0,0 +1,9 @@
+/* $OpenBSD: umac128.c,v 1.1 2017/12/12 15:06:12 naddy Exp $ */
+
+#define UMAC_OUTPUT_LEN 16
+#define umac_new umac128_new
+#define umac_update umac128_update
+#define umac_final umac128_final
+#define umac_delete umac128_delete
+
+#include "umac.c"