diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-23 16:44:33 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-23 16:44:33 +0100 |
| commit | 3f76fbfa72789f918cb72ae9c4347844625e55dc (patch) | |
| tree | 7b02b290157ec43e3c81054f24d415f242a387d5 | |
| parent | df82efbdf8ba8b32a31ffb2e1db097976d43b4a9 (diff) | |
| parent | 37ef840f776153ca04d06ba8e1527001aebd07ba (diff) | |
| download | mariadb-git-3f76fbfa72789f918cb72ae9c4347844625e55dc.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| -rw-r--r-- | extra/yassl/src/ssl.cpp | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/integer.cpp | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/test/test.cpp | 3 | ||||
| -rw-r--r-- | extra/yassl/testsuite/testsuite.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 70198af79b4..5bbde13a652 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -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); diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp index 419783403ea..85733b88aa9 100644 --- a/extra/yassl/taocrypt/src/integer.cpp +++ b/extra/yassl/taocrypt/src/integer.cpp @@ -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 { diff --git a/extra/yassl/taocrypt/test/test.cpp b/extra/yassl/taocrypt/test/test.cpp index 9cf9c52b2c7..0af278404ab 100644 --- a/extra/yassl/taocrypt/test/test.cpp +++ b/extra/yassl/taocrypt/test/test.cpp @@ -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); diff --git a/extra/yassl/testsuite/testsuite.cpp b/extra/yassl/testsuite/testsuite.cpp index 1cf6a78ebe7..3cd832ebb03 100644 --- a/extra/yassl/testsuite/testsuite.cpp +++ b/extra/yassl/testsuite/testsuite.cpp @@ -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*); |