[BACK]Return to umac.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/umac.c between version 1.14 and 1.15

version 1.14, 2017/11/28 06:04:51 version 1.15, 2017/11/28 06:09:38
Line 131 
Line 131 
   
 #if BYTE_ORDER == LITTLE_ENDIAN  #if BYTE_ORDER == LITTLE_ENDIAN
 #define LOAD_UINT32_REVERSED(p)         get_u32(p)  #define LOAD_UINT32_REVERSED(p)         get_u32(p)
 #define STORE_UINT32_REVERSED(p,v)      put_u32(p,v)  #define STORE_UINT32_REVERSED(p,v)      put_u32(p,v)
 #else  #else
 #define LOAD_UINT32_REVERSED(p)         get_u32_le(p)  #define LOAD_UINT32_REVERSED(p)         get_u32_le(p)
 #define STORE_UINT32_REVERSED(p,v)      put_u32_le(p,v)  #define STORE_UINT32_REVERSED(p,v)      put_u32_le(p,v)
 #endif  #endif
   
 #define LOAD_UINT32_LITTLE(p)           (get_u32_le(p))  #define LOAD_UINT32_LITTLE(p)           (get_u32_le(p))
Line 676 
Line 676 
         nh_transform(hc, hc->data, nh_len);          nh_transform(hc, hc->data, nh_len);
         hc->bytes_hashed += hc->next_data_empty;          hc->bytes_hashed += hc->next_data_empty;
     } else if (hc->bytes_hashed == 0) {      } else if (hc->bytes_hashed == 0) {
         nh_len = L1_PAD_BOUNDARY;          nh_len = L1_PAD_BOUNDARY;
         zero_pad(hc->data, L1_PAD_BOUNDARY);          zero_pad(hc->data, L1_PAD_BOUNDARY);
         nh_transform(hc, hc->data, nh_len);          nh_transform(hc, hc->data, nh_len);
     }      }
Line 1127 
Line 1127 
      * the polyhash.       * the polyhash.
      */       */
     if (len <= L1_KEY_LEN) {      if (len <= L1_KEY_LEN) {
         if (len == 0)                  /* If zero length messages will not */          if (len == 0)                  /* If zero length messages will not */
                 nh_len = L1_PAD_BOUNDARY;  /* be seen, comment out this case   */                  nh_len = L1_PAD_BOUNDARY;  /* be seen, comment out this case   */
         else          else
                 nh_len = ((len + (L1_PAD_BOUNDARY - 1)) & ~(L1_PAD_BOUNDARY - 1));                  nh_len = ((len + (L1_PAD_BOUNDARY - 1)) & ~(L1_PAD_BOUNDARY - 1));
         extra_zeroes_needed = nh_len - len;          extra_zeroes_needed = nh_len - len;
         zero_pad((UINT8 *)msg + len, extra_zeroes_needed);          zero_pad((UINT8 *)msg + len, extra_zeroes_needed);
         nh(&ahc->hash, (UINT8 *)msg, nh_len, len, nh_result);          nh(&ahc->hash, (UINT8 *)msg, nh_len, len, nh_result);

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15