Import patch from yaSSL after fixing warnings upstream

parent 7216b67a
......@@ -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);
......
......@@ -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
{
......
......@@ -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);
......
......@@ -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*);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment