summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in13
-rw-r--r--umac.c2
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 @@
31 - markus@cvs.openbsd.org 2012/10/04 13:21:50 31 - markus@cvs.openbsd.org 2012/10/04 13:21:50
32 [myproposal.h ssh_config.5 umac.h sshd_config.5 ssh.1 sshd.8 mac.c] 32 [myproposal.h ssh_config.5 umac.h sshd_config.5 ssh.1 sshd.8 mac.c]
33 add umac128 variant; ok djm@ at n2k12 33 add umac128 variant; ok djm@ at n2k12
34 - [Makefile umac.c] Add special-case target to build umac128.o.
34 35
3520120917 3620120917
36 - (dtucker) OpenBSD CVS Sync 37 - (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 @@
1# $Id: Makefile.in,v 1.326 2012/04/04 01:27:57 djm Exp $ 1# $Id: Makefile.in,v 1.327 2012/10/05 01:38:25 dtucker Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -70,8 +70,8 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
70 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ 70 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
71 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ 71 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
72 kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ 72 kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
73 msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \ 73 msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
74 schnorr.o ssh-pkcs11.o 74 jpake.o schnorr.o ssh-pkcs11.o
75 75
76SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ 76SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
77 sshconnect.o sshconnect1.o sshconnect2.o mux.o \ 77 sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@@ -195,6 +195,13 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
195moduli: 195moduli:
196 echo 196 echo
197 197
198# special case target for umac128
199umac128.o: umac.c
200 $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $< \
201 -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \
202 -Dumac_update=umac128_update -Dumac_final=umac128_final \
203 -Dumac_delete=umac128_delete
204
198clean: regressclean 205clean: regressclean
199 rm -f *.o *.a $(TARGETS) logintest config.cache config.log 206 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
200 rm -f *.out core survey 207 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 @@
52/* --- User Switches ---------------------------------------------------- */ 52/* --- User Switches ---------------------------------------------------- */
53/* ---------------------------------------------------------------------- */ 53/* ---------------------------------------------------------------------- */
54 54
55#ifndef UMAC_OUTPUT_LEN
55#define UMAC_OUTPUT_LEN 8 /* Alowable: 4, 8, 12, 16 */ 56#define UMAC_OUTPUT_LEN 8 /* Alowable: 4, 8, 12, 16 */
57#endif
56/* #define FORCE_C_ONLY 1 ANSI C and 64-bit integers req'd */ 58/* #define FORCE_C_ONLY 1 ANSI C and 64-bit integers req'd */
57/* #define AES_IMPLEMENTAION 1 1 = OpenSSL, 2 = Barreto, 3 = Gladman */ 59/* #define AES_IMPLEMENTAION 1 1 = OpenSSL, 2 = Barreto, 3 = Gladman */
58/* #define SSE2 0 Is SSE2 is available? */ 60/* #define SSE2 0 Is SSE2 is available? */