Fixed in fdc35a9d3e8cf4cfd9330d5df9883f42cf5648ad. Sorry about that, Emilia
On Thu, Sep 25, 2014 at 1:28 PM, Emilia Käsper <[email protected]> wrote: > Appears to be a bad git merge on my side. I'm on it. > > On Thu, Sep 25, 2014 at 1:23 PM, Ben Laurie <[email protected]> wrote: > >> Workaround (I wasn't sure if the functions were intended to be used >> somewhere, so not deleted yet): >> >> diff --git a/crypto/constant_time_test.c b/crypto/constant_time_test.c >> index 1b4b18d..78e7fca 100644 >> --- a/crypto/constant_time_test.c >> +++ b/crypto/constant_time_test.c >> @@ -195,7 +195,7 @@ static int test_select_int(int a, int b) >> } >> return 0; >> } >> - >> +/* >> static int test_eq_int(int a, int b) >> { >> unsigned int equal = constant_time_eq_int(a, b); >> @@ -235,7 +235,7 @@ static int test_eq_int_8(int a, int b) >> } >> return 0; >> } >> - >> +*/ >> static unsigned int test_values[] = {0, 1, 1024, 12345, 32000, >> UINT_MAX/2-1, >> UINT_MAX/2, UINT_MAX/2+1, >> UINT_MAX-1, >> UINT_MAX}; >> ______________________________________________________________________ >> OpenSSL Project http://www.openssl.org >> Team Mailing List [email protected] >> Automated List Manager [email protected] >> > >
