Addendum to Nelson's checkin on 2005-08-09: convert NSS_USE_HYBRID to NSS_USE_ABI32_FPU. This change should only affect RC4 on the HPUX "hybrid" builds. NSS_PERFORMANCE_HACKS_BRANCH
authorsaul.edwards%sun.com
Tue, 30 Aug 2005 08:34:36 +0000
branchNSS_PERFORMANCE_HACKS_BRANCH
changeset 6071 a22cb477154e0fd640cc745fd77631b760688084
parent 6070 f065c8de774160b145201ed3ca1eecaca5aae8ba
child 13753 e0f2c498feab3491c7d262dd9c91ec67984e814d
push idunknown
push userunknown
push dateunknown
Addendum to Nelson's checkin on 2005-08-09: convert NSS_USE_HYBRID to NSS_USE_ABI32_FPU. This change should only affect RC4 on the HPUX "hybrid" builds.
security/nss/lib/freebl/arcfour.c
--- a/security/nss/lib/freebl/arcfour.c
+++ b/security/nss/lib/freebl/arcfour.c
@@ -346,17 +346,17 @@ rc4_unrolled(RC4Context *cx, unsigned ch
 #else
 #define ARCFOUR_NEXT4BYTES_B(n) \
 	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n + 24); \
 	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n + 16); \
 	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n +  8); \
 	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n     );
 #endif
 
-#if (defined(NSS_USE_HYBRID) && !defined(SOLARIS)) || defined(NSS_USE_64)
+#if (defined(NSS_USE_ABI32_FPU) && !defined(SOLARIS)) || defined(NSS_USE_64)
 /* 64-bit wordsize */
 #ifdef IS_LITTLE_ENDIAN
 #define ARCFOUR_NEXT_WORD() \
 	{ streamWord = 0; ARCFOUR_NEXT4BYTES_L(0); ARCFOUR_NEXT4BYTES_L(32); }
 #else
 #define ARCFOUR_NEXT_WORD() \
 	{ streamWord = 0; ARCFOUR_NEXT4BYTES_B(32); ARCFOUR_NEXT4BYTES_B(0); }
 #endif