Call for testing for 3.5 OpenSSH

[Wendy Palm]

Michael Tokarev wrote:
> 
> Ben Lindstrom wrote:
> 
> []
> >>*** 101,111 ****
> >>--- 101,119 ----
> >>        if (h == NULL) {
> >>                debug("Installing crc compensation attack detector.");
> >>                n = l;
> >>+ #if defined(_CRAY) && !defined(_CRAYSV2)
> >>+               h = (u_int16_t *) xmalloc(n * sizeof(u_int16_t));
> >>+ #else
> >>                h = (u_int16_t *) xmalloc(n * HASH_ENTRYSIZE);
> >>+ #endif /* _CRAY */
> >>        } else {
> >>                if (l > n) {
> >>                        n = l;
> >>+ #if defined(_CRAY) && !defined(_CRAYSV2)
> >>+                       h = (u_int16_t *) xrealloc(h, n * sizeof(u_int16_t));
> >>+ #else
> >>                        h = (u_int16_t *) xrealloc(h, n * HASH_ENTRYSIZE);
> >>+ #endif /* _CRAY */
> 
> etc etc.  I think this way will be *much* simpler:
> 
> #if defined(_CRAY) && ! defined(_CRAYSV2)
>   #include <ia.h>
>   #define HASH_ENTRYSIZE sizeof(u_int16_t)
>   #define HASH_UNUSEDCHAR (HASH_UNUSED>>8)
> #endif /* _CRAY */
> 
> and just forgot about this whole hunk?
> 
> Also, instead of repeating "#if defined(_CRAY) && ! defined(_CRAYSV2)",
> will it be better to use something like
> 
> #if defined(_CRAY) && ! defined(_CRAYSV2)
> # define _CRAY_IA
> #endif
> 
> and use #if _CRAY_IA (or whatether) in the rest of places?
> 
> /mjt


actually, they changed the CRAYSV2 name on me and i've finally 
got them to straighten out the macros, so this should be changed from
#if defined(_CRAY) && !defined(_CRAYSV2)
to
#ifdef _UNICOS

(they changed the name on me after i sent the initial patches in,
but didn't have the macros ready for the new name.  this only 
got resolved recently.)

the new macro means all the "old" cray machines
but not the "new" cray machine (and future machines).

i can compile an entirely new patch with this change in it for
the whole thing.
-- 
wendy palm
Cray OS Sustaining Engineering, Cray Inc.
wendyp at cray.com, 651-605-9154