tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- [Makefile umac.c] Add special-case target to build umac128.o.

Browse Source
This commit is contained in:
Darren Tucker 2012-10-05 11:38:24 +10:00
parent 7f93315c3a
commit 992faad1f1
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -31,6 +31,7 @@
- markus@cvs.openbsd.org 2012/10/04 13:21:50 - 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] [myproposal.h ssh_config.5 umac.h sshd_config.5 ssh.1 sshd.8 mac.c]
add umac128 variant; ok djm@ at n2k12 add umac128 variant; ok djm@ at n2k12
- [Makefile umac.c] Add special-case target to build umac128.o.
20120917 20120917
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

13
Makefile.in
View File

@ -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 # uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@ #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 \ 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 \ 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 \ 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 \ msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
schnorr.o ssh-pkcs11.o jpake.o schnorr.o ssh-pkcs11.o
SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
sshconnect.o sshconnect1.o sshconnect2.o mux.o \ sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@ -195,6 +195,13 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
moduli: moduli:
echo 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 clean: regressclean
rm -f *.o *.a $(TARGETS) logintest config.cache config.log rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core survey rm -f *.out core survey

2
umac.c
View File

@ -52,7 +52,9 @@
/* --- User Switches ---------------------------------------------------- */ /* --- User Switches ---------------------------------------------------- */
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
#ifndef UMAC_OUTPUT_LEN
#define UMAC_OUTPUT_LEN 8 /* Alowable: 4, 8, 12, 16 */ #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 FORCE_C_ONLY 1 ANSI C and 64-bit integers req'd */
/* #define AES_IMPLEMENTAION 1 1 = OpenSSL, 2 = Barreto, 3 = Gladman */ /* #define AES_IMPLEMENTAION 1 1 = OpenSSL, 2 = Barreto, 3 = Gladman */
/* #define SSE2 0 Is SSE2 is available? */ /* #define SSE2 0 Is SSE2 is available? */