mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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)
{
static char* msg = "Please supply a buffer for error string";
static char* msg = (char*)"Please supply a buffer for error string";
if (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);
SetWords(r.reg_+wordCount, 0, r.reg_.size()-wordCount);
if (n % WORD_BITS != 0)
r.reg_[wordCount-1] %= (1 << (n % WORD_BITS));
r.reg_[wordCount-1] %= (word(1) << (n % WORD_BITS));
}
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)) {}
};
void file_test(int, char**);
int sha_test();
int sha256_test();
#ifdef WORD64_AVAILABLE
@ -300,7 +299,7 @@ void taocrypt_test(void* args)
#endif // NO_MAIN_DRIVER
void file_test(char* file, byte* check)
void file_test(const char* file, byte* check)
{
FILE* f;
int i(0);

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

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