3 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index cb28e777d..ef85bec3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
    - markus@cvs.openbsd.org 2012/10/04 13:21:50
      [myproposal.h ssh_config.5 umac.h sshd_config.5 ssh.1 sshd.8 mac.c]
      add umac128 variant; ok djm@ at n2k12
+ - [Makefile umac.c] Add special-case target to build umac128.o.
 
 20120917
  - (dtucker) OpenBSD CVS Sync
diff --git a/Makefile.in b/Makefile.in
index 566f58fe6..a0dc5dcf7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.326 2012/04/04 01:27:57 djm Exp $
+# $Id: Makefile.in,v 1.327 2012/10/05 01:38:25 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -70,8 +70,8 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
         atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
         monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
         kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
-        msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \
-        schnorr.o ssh-pkcs11.o
+        msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
+        jpake.o schnorr.o ssh-pkcs11.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
         sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@@ -195,6 +195,13 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
 moduli:
         echo
 
+# special case target for umac128
+umac128.o:      umac.c
+        $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $< \
+            -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \
+            -Dumac_update=umac128_update -Dumac_final=umac128_final \
+            -Dumac_delete=umac128_delete
+
 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 e78d2cc5f..e373de5be 100644
--- a/umac.c
+++ b/umac.c
@@ -52,7 +52,9 @@
 /* --- User Switches ---------------------------------------------------- */
 /* ---------------------------------------------------------------------- */
 
+#ifndef UMAC_OUTPUT_LEN
 #define UMAC_OUTPUT_LEN     8  /* Alowable: 4, 8, 12, 16                  */
+#endif
 /* #define FORCE_C_ONLY        1  ANSI C and 64-bit integers req'd        */
 /* #define AES_IMPLEMENTAION   1  1 = OpenSSL, 2 = Barreto, 3 = Gladman   */
 /* #define SSE2                0  Is SSE2 is available?                   */