From 74869268a9de2fbdd85171f6d77f8c5f77042702 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Feb 2007 14:18:12 +0100 Subject: [PATCH] Bug#26678 SSL tests fail on win64 - Import a patch from yaSSL CVS that uses "word" instead of "unsigned long" in three function's that uses sizeof to find out the word size being used. NOTE! long is 32 bit also on 64 bit windows. extra/yassl/taocrypt/include/misc.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/misc.cpp: Import patch yassl.diff --- extra/yassl/taocrypt/include/misc.hpp | 6 +++--- extra/yassl/taocrypt/src/misc.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp index 392db38410a..224589e0640 100644 --- a/extra/yassl/taocrypt/include/misc.hpp +++ b/extra/yassl/taocrypt/include/misc.hpp @@ -858,9 +858,9 @@ inline T1 SaturatingSubtract(T1 a, T2 b) // declares -unsigned int BytePrecision(unsigned long value); -unsigned int BitPrecision(unsigned long); -unsigned long Crop(unsigned long value, unsigned int size); +unsigned int BytePrecision(word value); +unsigned int BitPrecision(word); +word Crop(word value, unsigned int size); diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp index 83acc15277d..726d9e630e6 100644 --- a/extra/yassl/taocrypt/src/misc.cpp +++ b/extra/yassl/taocrypt/src/misc.cpp @@ -122,7 +122,7 @@ void xorbuf(byte* buf, const byte* mask, unsigned int count) } -unsigned int BytePrecision(unsigned long value) +unsigned int BytePrecision(word value) { unsigned int i; for (i=sizeof(value); i; --i) @@ -133,7 +133,7 @@ unsigned int BytePrecision(unsigned long value) } -unsigned int BitPrecision(unsigned long value) +unsigned int BitPrecision(word value) { if (!value) return 0; @@ -154,7 +154,7 @@ unsigned int BitPrecision(unsigned long value) } -unsigned long Crop(unsigned long value, unsigned int size) +word Crop(word value, unsigned int size) { if (size < 8*sizeof(value)) return (value & ((1L << size) - 1));