From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 29 Sep 2010 21:52:57 +0000 (+0000)
Subject: Make DO_FAST_XOR code unconditional in the NSS back end
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b78a5237be786bae47bc16b1200cc80bbd3943e4;p=thirdparty%2Fkrb5.git

Make DO_FAST_XOR code unconditional in the NSS back end

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/nss@24380 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/crypto/nss/enc_provider/enc_gen.c b/src/lib/crypto/nss/enc_provider/enc_gen.c
index 779a502784..92d30b0491 100644
--- a/src/lib/crypto/nss/enc_provider/enc_gen.c
+++ b/src/lib/crypto/nss/enc_provider/enc_gen.c
@@ -26,10 +26,6 @@
  * or implied warranty.
  */
 
-/* compile options (should move to configure)... */
-#define DO_FAST_XOR 1
-/*#define FAKE_FIPS 1  */
-
 #include "k5-int.h"
 #include "nss_gen.h"
 #include "enc_provider.h"
@@ -143,7 +139,6 @@ xor(unsigned char *x, unsigned char *y, int size)
 {
     int i;
 
-#ifdef DO_FAST_XOR
 #define ALIGNED(x,type) (!(((size_t)(x))&(sizeof(type)-1)))
     if (ALIGNED(x,unsigned long) && ALIGNED(y, unsigned long)
         && ALIGNED(size, unsigned long)) {
@@ -154,7 +149,6 @@ xor(unsigned char *x, unsigned char *y, int size)
         }
         return;
     }
-#endif
     for (i=0; i < size; i++) {
         *x++ ^= *y++;
     }