apologies; I forgot to commit the header. Fixed now On Mon, 22 Jul 2013, Jasper Lievisse Adriaanse wrote:
> On Sun, Jul 21, 2013 at 11:00:17PM -0600, Damien Miller wrote: > > CVSROOT: /cvs > > Module name: src > > Changes by: d...@cvs.openbsd.org 2013/07/21 23:00:17 > > > > Modified files: > > usr.bin/ssh : umac.c > > > > Log message: > > make MAC key, data to be hashed and nonce for final hash const; > > checked with -Wcast-qual > Hi, > > It seems this commit broke the tree: > > cc -O2 -pipe -g -I/usr/src/usr.bin/ssh/lib/.. -DENABLE_PKCS11 -DHAVE_DLOPEN > -DKRB5 -I/usr/include/kerberosV -DGSSAPI -I/usr/src/usr.bin/ssh/lib/.. > -DENABLE_PKCS11 -c /usr/src/usr.bin/ssh/lib/../umac.c -o umac.o > /usr/src/usr.bin/ssh/lib/../umac.c:1213: error: conflicting types for > 'umac_new' > /usr/src/usr.bin/ssh/lib/../umac.h:55: error: previous declaration of > 'umac_new' was here > /usr/src/usr.bin/ssh/lib/../umac.c:1238: error: conflicting types for > 'umac_final' > /usr/src/usr.bin/ssh/lib/../umac.h:68: error: previous declaration of > 'umac_final' was here > /usr/src/usr.bin/ssh/lib/../umac.c:1251: error: conflicting types for > 'umac_update' > /usr/src/usr.bin/ssh/lib/../umac.h:65: error: previous declaration of > 'umac_update' was here > > -- > Cheers, > Jasper > > "Stay Hungry. Stay Foolish"
