Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  PR5686: correct regression in semok/optimize.stp
  trailing whitespace removal, as approved by emacs
  fix global-var array index rendering
  fix NEWS to refer to simpler context.stp tapset functions in auto-printing blurb
  Document written but unread global variable automatic display.
  2nd try
  initial
  Make _get_sock_addr return correct address in kernel before 2.6.16.
  Automatically print written but unread globals
  Make nodwf test passed when CONFIG_QUOTACTL unset
  Uses STAPCONF_DPATH_PATH instead of a kernel version check.
  Simplified "rpm" target a bit.
  Moved tar archive creation step from "rpm" target to "dist-gzip" target.
  remove support for "make dist" since git-archive does as well;
  Examples html files moved into subdir.
  2008-08-25  David Smith  <dsmith@redhat.com>
  ChangeLog Entries
  Robustness improvements for the stap client/server

1 files changed, 23 insertions, 23 deletions

diff --git a/mdfour.c b/mdfour.c
index d33925ad..a942dc9c 100644
--- a/mdfour.c
+++ b/mdfour.c
@@ -1,17 +1,17 @@
-/* 
+/*
    a implementation of MD4 designed for use in the SMB authentication protocol
    Copyright (C) Andrew Tridgell 1997-1998.
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "mdfour.h"
 
-/* NOTE: This code makes no attempt to be fast! 
+/* NOTE: This code makes no attempt to be fast!
 
    It assumes that a int is at least 32 bits long
 */
@@ -46,41 +46,41 @@ mdfour64(uint32_t *M)
   uint32_t AA, BB, CC, DD;
   uint32_t A,B,C,D;
 
-  A = m->A; B = m->B; C = m->C; D = m->D; 
+  A = m->A; B = m->B; C = m->C; D = m->D;
   AA = A; BB = B; CC = C; DD = D;
 
-  ROUND1(A,B,C,D,  0,  3);  ROUND1(D,A,B,C,  1,  7);  
+  ROUND1(A,B,C,D,  0,  3);  ROUND1(D,A,B,C,  1,  7);
   ROUND1(C,D,A,B,  2, 11);  ROUND1(B,C,D,A,  3, 19);
-  ROUND1(A,B,C,D,  4,  3);  ROUND1(D,A,B,C,  5,  7);  
+  ROUND1(A,B,C,D,  4,  3);  ROUND1(D,A,B,C,  5,  7);
   ROUND1(C,D,A,B,  6, 11);  ROUND1(B,C,D,A,  7, 19);
-  ROUND1(A,B,C,D,  8,  3);  ROUND1(D,A,B,C,  9,  7);  
+  ROUND1(A,B,C,D,  8,  3);  ROUND1(D,A,B,C,  9,  7);
   ROUND1(C,D,A,B, 10, 11);  ROUND1(B,C,D,A, 11, 19);
-  ROUND1(A,B,C,D, 12,  3);  ROUND1(D,A,B,C, 13,  7);  
-  ROUND1(C,D,A,B, 14, 11);  ROUND1(B,C,D,A, 15, 19);	
+  ROUND1(A,B,C,D, 12,  3);  ROUND1(D,A,B,C, 13,  7);
+  ROUND1(C,D,A,B, 14, 11);  ROUND1(B,C,D,A, 15, 19);
 
 
-  ROUND2(A,B,C,D,  0,  3);  ROUND2(D,A,B,C,  4,  5);  
+  ROUND2(A,B,C,D,  0,  3);  ROUND2(D,A,B,C,  4,  5);
   ROUND2(C,D,A,B,  8,  9);  ROUND2(B,C,D,A, 12, 13);
-  ROUND2(A,B,C,D,  1,  3);  ROUND2(D,A,B,C,  5,  5);  
+  ROUND2(A,B,C,D,  1,  3);  ROUND2(D,A,B,C,  5,  5);
   ROUND2(C,D,A,B,  9,  9);  ROUND2(B,C,D,A, 13, 13);
-  ROUND2(A,B,C,D,  2,  3);  ROUND2(D,A,B,C,  6,  5);  
+  ROUND2(A,B,C,D,  2,  3);  ROUND2(D,A,B,C,  6,  5);
   ROUND2(C,D,A,B, 10,  9);  ROUND2(B,C,D,A, 14, 13);
-  ROUND2(A,B,C,D,  3,  3);  ROUND2(D,A,B,C,  7,  5);  
+  ROUND2(A,B,C,D,  3,  3);  ROUND2(D,A,B,C,  7,  5);
   ROUND2(C,D,A,B, 11,  9);  ROUND2(B,C,D,A, 15, 13);
 
-  ROUND3(A,B,C,D,  0,  3);  ROUND3(D,A,B,C,  8,  9);  
+  ROUND3(A,B,C,D,  0,  3);  ROUND3(D,A,B,C,  8,  9);
   ROUND3(C,D,A,B,  4, 11);  ROUND3(B,C,D,A, 12, 15);
-  ROUND3(A,B,C,D,  2,  3);  ROUND3(D,A,B,C, 10,  9);  
+  ROUND3(A,B,C,D,  2,  3);  ROUND3(D,A,B,C, 10,  9);
   ROUND3(C,D,A,B,  6, 11);  ROUND3(B,C,D,A, 14, 15);
-  ROUND3(A,B,C,D,  1,  3);  ROUND3(D,A,B,C,  9,  9);  
+  ROUND3(A,B,C,D,  1,  3);  ROUND3(D,A,B,C,  9,  9);
   ROUND3(C,D,A,B,  5, 11);  ROUND3(B,C,D,A, 13, 15);
-  ROUND3(A,B,C,D,  3,  3);  ROUND3(D,A,B,C, 11,  9);  
+  ROUND3(A,B,C,D,  3,  3);  ROUND3(D,A,B,C, 11,  9);
   ROUND3(C,D,A,B,  7, 11);  ROUND3(B,C,D,A, 15, 15);
 
-  A += AA; B += BB; 
+  A += AA; B += BB;
   C += CC; D += DD;
-	
-  A &= MASK32; B &= MASK32; 
+
+  A &= MASK32; B &= MASK32;
   C &= MASK32; D &= MASK32;
 
   m->A = A; m->B = B; m->C = C; m->D = D;
@@ -140,7 +140,7 @@ mdfour_tail(const unsigned char *in, int n)
     }
   else
     {
-      copy4(buf+120, b); 
+      copy4(buf+120, b);
       copy64(M, buf);
       mdfour64(M);
       copy64(M, buf+64);