not quite, because your diff was mangled, but I think
you had it right anyway.. fix committed by miod, thanks for
telling us.
On Wed, Apr 16, 2014 at 03:39:03PM +1000, Ian McWilliam wrote:
> Hoope the attached diff is a correct fix. Hit me with the cluebat if
> not.
>
> cc -O2 -pipe ??-Wall -I/usr/src/sbin/iked -Wstrict-prototypes
> -Wmissing-prototypes -Wmissing-declarations -Wshadow -Wpointer-arith
> -Wcast-qual -Wsign-compare -fno-pie ?? -c
> /usr/src/sbin/iked/chap_ms.c/usr/src/sbin/iked/chap_ms.c: In function
> 'mschap_des_addparity':/usr/src/sbin/iked/chap_ms.c:104: error:
> 'des_cblock' undeclared (first use in this
> function)/usr/src/sbin/iked/chap_ms.c:104: error: (Each undeclared
> identifier is reported only once/usr/src/sbin/iked/chap_ms.c:104:
> error: for each function it appears
> in.)/usr/src/sbin/iked/chap_ms.c:104: error: expected expression
> before ')' token/usr/src/sbin/iked/chap_ms.c: In function
> 'mschap_des_encrypt':/usr/src/sbin/iked/chap_ms.c:110: error:
> 'des_cblock' undeclared (first use in this
> function)/usr/src/sbin/iked/chap_ms.c:110: error: expected ';' before
> 'des_key'/usr/src/sbin/iked/chap_ms.c:111: error: 'des_key_schedule'
> undeclared (first use in this
> function)/usr/src/sbin/iked/chap_ms.c:111: error: expected ';' before
> 'key_schedule'/usr/src/sbin/iked/chap_ms.c:113: error: 'des_key'
> undeclared (first use in this
> function)/usr/src/sbin/iked/chap_ms.c:115: error: 'key_schedule'
> undeclared (first use in this
> function)/usr/src/sbin/iked/chap_ms.c:116: error: expected expression
> before ')' token/usr/src/sbin/iked/chap_ms.c:117: error: too few
> arguments to function 'DES_ecb_encrypt'*** Error 1 in
> /usr/src/sbin/iked (:87 'chap_ms.o')
> ? chap_ms.c.ianm? ided.diffIndex:
> chap_ms.c===================================================================RCS
> file: /cvs/src/sbin/iked/chap_ms.c,vretrieving revision 1.6diff -u -p
> -u -p -r1.6 chap_ms.c--- chap_ms.c ?? 8 Jan 2013 10:38:19 -0000 ?? ??
> ?? 1.6+++ chap_ms.c ?? 16 Apr 2014 05:30:50 -0000@@ -101,19 +101,19 @@
> mschap_des_addparity(u_int8_t *key, u_in?? ?? ?? ?? des_key[6] =
> get7bits(key, 42);?? ?? ?? ?? des_key[7] = get7bits(key, 49);
> - ?? ?? ?? DES_set_odd_parity((des_cblock *)des_key);+ ?? ?? ??
> DES_set_odd_parity((DES_cblock *)des_key);??}
> ??void??mschap_des_encrypt(u_int8_t *clear, u_int8_t *key, u_int8_t
> *cipher)??{- ?? ?? ?? des_cblock ?? ?? ?? ?? ?? ?? ??des_key;- ?? ??
> ?? des_key_schedule ?? ?? ?? ??key_schedule;+ ?? ?? ?? DES_cblock ??
> ?? ?? ?? ?? ?? ??des_key;+ ?? ?? ?? DES_key_schedule ?? ?? ??
> ??key_schedule;
> ?? ?? ?? ?? mschap_des_addparity(key, des_key);
> ?? ?? ?? ?? DES_set_key(&des_key, &key_schedule);- ?? ?? ??
> DES_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,+ ?? ?? ??
> DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,?? ?? ?? ??
> ?? ?? &key_schedule, 1);??}
>
