1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@pilot.blaudden 2007-03-23 16:44:33 +01:00
commit d8ab3024a4
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/yassl/src/ssl.cpp
View File

@ -950,7 +950,7 @@ void ERR_print_errors_fp(FILE* /*fp*/)
char* ERR_error_string(unsigned long errNumber, char* buffer) char* ERR_error_string(unsigned long errNumber, char* buffer)
{ {
static char* msg = "Please supply a buffer for error string"; static char* msg = (char*)"Please supply a buffer for error string";
if (buffer) { if (buffer) {
SetErrorString(YasslError(errNumber), buffer); SetErrorString(YasslError(errNumber), buffer);

2
extra/yassl/taocrypt/src/integer.cpp
View File

@ -3390,7 +3390,7 @@ void Integer::DivideByPowerOf2(Integer &r, Integer &q, const Integer &a,
CopyWords(r.reg_.get_buffer(), a.reg_.get_buffer(), wordCount); CopyWords(r.reg_.get_buffer(), a.reg_.get_buffer(), wordCount);
SetWords(r.reg_+wordCount, 0, r.reg_.size()-wordCount); SetWords(r.reg_+wordCount, 0, r.reg_.size()-wordCount);
if (n % WORD_BITS != 0) if (n % WORD_BITS != 0)
r.reg_[wordCount-1] %= (1 << (n % WORD_BITS)); r.reg_[wordCount-1] %= (word(1) << (n % WORD_BITS));
} }
else else
{ {

3
extra/yassl/taocrypt/test/test.cpp
View File

@ -94,7 +94,6 @@ struct testVector {
output_((byte*)out), inLen_(strlen(in)), outLen_(strlen(out)) {} output_((byte*)out), inLen_(strlen(in)), outLen_(strlen(out)) {}
}; };
void file_test(int, char**);
int sha_test(); int sha_test();
int sha256_test(); int sha256_test();
#ifdef WORD64_AVAILABLE #ifdef WORD64_AVAILABLE
@ -300,7 +299,7 @@ void taocrypt_test(void* args)
#endif // NO_MAIN_DRIVER #endif // NO_MAIN_DRIVER
void file_test(char* file, byte* check) void file_test(const char* file, byte* check)
{ {
FILE* f; FILE* f;
int i(0); int i(0);

2
extra/yassl/testsuite/testsuite.cpp
View File

@ -7,7 +7,7 @@
typedef unsigned char byte; typedef unsigned char byte;
void taocrypt_test(void*); void taocrypt_test(void*);
void file_test(char*, byte*); void file_test(const char*, byte*);
void client_test(void*); void client_test(void*);
void echoclient_test(void*); void echoclient_test(void*);