From: Tom Keiser <tkeiser@gmail.com>
Date: Thu, 18 Aug 2005 05:56:14 +0000 (+0000)
Subject: STABLE14-des-nostats-20050818
X-Git-Tag: openafs-stable-1_4_0-rc1~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9c746ef54833df416774deb983d44b474b009b5c;p=packages%2Fo%2Fopenafs.git

STABLE14-des-nostats-20050818

FIXES 20921

just yank for now, we'll fix for 1.4.1


(cherry picked from commit e14ef50cd5f40b403e71cc2068c98c6e06f2c612)
---

diff --git a/src/des/des.c b/src/des/des.c
index 780561196..138d48d7d 100644
--- a/src/des/des.c
+++ b/src/des/des.c
@@ -51,7 +51,6 @@ RCSID
 #ifdef BIG
 #include "p_table.h"
 #endif
-#include "stats.h"
 
 #include "des_prototypes.h"
 
@@ -101,10 +100,6 @@ des_ecb_encrypt(void * clear, void * cipher,
 #ifdef DEBUG
     afs_uint32 dbg_tmp[2];
 #endif
-    if (encrypt)
-	INC_RXKAD_STATS(des_encrypts[DES_ENCRYPT]);
-    else
-	INC_RXKAD_STATS(des_encrypts[DES_DECRYPT]);
     /*
      * Use L1,R1 and L2,R2 as two sets of "64-bit" registers always
      * work from L1,R1 input to L2,R2 output; initialize the cleartext
diff --git a/src/des/key_sched.c b/src/des/key_sched.c
index 93eefb03b..a49354fb2 100644
--- a/src/des/key_sched.c
+++ b/src/des/key_sched.c
@@ -39,7 +39,6 @@ RCSID
 
 #include "des.h"
 #include "key_perm.h"
-#include "stats.h"
 #include "des_prototypes.h"
 
 typedef char key[64];
@@ -66,7 +65,6 @@ des_key_sched(register des_cblock k, des_key_schedule schedule)
     n = 0;
     p_char = k_char;
 
-    INC_RXKAD_STATS(des_key_scheds);
 #ifdef lint
     n = n;			/* fool it in case of VAXASM */
 #endif
diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c
index ab44a5eb6..91a4b600a 100644
--- a/src/des/new_rnd_key.c
+++ b/src/des/new_rnd_key.c
@@ -38,7 +38,6 @@ RCSID
 #include <strings.h>
 #endif
 #endif
-#include "stats.h"
 
 static afs_int32 des_set_sequence_number(des_cblock new_sequence_number);
 static afs_int32 des_generate_random_block(des_cblock block);
@@ -257,7 +256,6 @@ des_generate_random_block(des_cblock block)
 {
     int i;
 
-    INC_RXKAD_STATS(des_randoms);
     /*
      * Encrypt the sequence number to get the new random block:
      */