Skip to content

Commit

Permalink
Core: Fix warnings. Make callback symbols local.
Browse files Browse the repository at this point in the history
  • Loading branch information
@QAston
QAston committed Aug 18, 2013
1 parent ff3ff68 commit 0513d9c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/server/shared/Cryptography/OpenSSLCrypto.cpp
View file
Expand Up @@ -23,15 +23,15 @@

std::vector<ACE_Thread_Mutex*> cryptoLocks;

void lockingCallback(int mode, int type, const char *file, int line)
static void lockingCallback(int mode, int type, const char */*file*/, int /*line*/)
{
if (mode & CRYPTO_LOCK)
cryptoLocks[type]->acquire();
else
cryptoLocks[type]->release();
}

void threadIdCallback(CRYPTO_THREADID * id)
static void threadIdCallback(CRYPTO_THREADID * id)
{
CRYPTO_THREADID_set_numeric(id, ACE_Thread::self());
}
Expand Down

20 comments on commit 0513d9c

@lev1976g
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linux compile error

[ 9%] Building CXX object src/server/shared/CMakeFiles/shared.dir/Cryptography/BigNumber.cpp.o
/home/compil/src/server/shared/Cryptography/BigNumber.cpp: In member function ‘ACE_Auto_Array_Ptr BigNumber::AsByteArray(int32, bool)’:
/home/compil/src/server/shared/Cryptography/BigNumber.cpp:189:43: error: no matching function for call to ‘ACE_Auto_Array_Ptr::ACE_Auto_Array_Ptr(ACE_Auto_Array_Ptr)’
/home/compil/src/server/shared/Cryptography/BigNumber.cpp:189:43: note: candidate is:
In file included from /usr/local/include/ace/Service_Gestalt.h:25:0,
from /usr/local/include/ace/Service_Object.h:27,
from /usr/local/include/ace/Task.h:17,
from /home/compil/src/server/shared/Logging/LogWorker.h:23,
from /home/compil/src/server/shared/Logging/Log.h:24,
from PrecompiledHeaders/sharedPCH.h:4:
/usr/local/include/ace/Auto_Ptr.h:168:7: note: ACE_Auto_Array_Ptr::ACE_Auto_Array_Ptr(ACE_Auto_Array_Ptr&)
/usr/local/include/ace/Auto_Ptr.h:168:7: note: no known conversion for argument 1 from ‘ACE_Auto_Array_Ptr’ to ‘ACE_Auto_Array_Ptr&’
make[2]: *** [src/server/shared/CMakeFiles/shared.dir/Cryptography/BigNumber.cpp.o] Ошибка 1
make[1]: *** [src/server/shared/CMakeFiles/shared.dir/all] Ошибка 2
make: *** [all] Ошибка 2
root@tdog:/home/compil#

@Aokromes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have re-run cmake?

@lev1976g
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes , does not compile

@Aokromes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And you use openssl 1.0.0?

@bilipp
Copy link

@bilipp bilipp commented on 0513d9c Aug 18, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here.. openssl 1.0.1

@lev1976g
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

openssl_0.9.8

@Aokromes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now TC NEEDS Openssl 1.0.0 minimum, we are looking for a fix with linux and 1.0.0 and >

@lev1976g
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aokromes, ок thank you

@kotori
Copy link

@kotori kotori commented on 0513d9c Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm getting this error as well,

src/server/shared/Cryptography/BigNumber.cpp: In member function 'ACE_Auto_Array_Ptr BigNumber::AsByteArray(int32, bool)':
src/server/shared/Cryptography/BigNumber.cpp:189:43: error: no matching function for call to 'ACE_Auto_Array_Ptr::ACE_Auto_Array_Ptr(ACE_Auto_Array_Ptr)'
src/server/shared/Cryptography/BigNumber.cpp:189:43: note: candidate is:
/usr/local/include/ace/Auto_Ptr.h:170:7: note: ACE_Auto_Array_Ptr::ACE_Auto_Array_Ptr(ACE_Auto_Array_Ptr&)
/usr/local/include/ace/Auto_Ptr.h:170:7: note: no known conversion for argument 1 from 'ACE_Auto_Array_Ptr' to 'ACE_Auto_Array_Ptr&'

make[2]: *** [src/server/shared/CMakeFiles/shared.dir/Cryptography/BigNumber.cpp.o] Error 1
make[1]: *** [src/server/shared/CMakeFiles/shared.dir/all] Error 2

make: *** [all] Error 2

I think my OpenSSL version is up-to date:

$ openssl version
OpenSSL 1.0.1 14 Mar 2012

Is this due to an outdated ACE install?

@Vasago
Copy link

@Vasago Vasago commented on 0513d9c Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When my server starts it says:
Using SSL version: OpenSSL 1.0.1e 11 Feb 2013 (library: OpenSSL 1.0.1c 10 May 2012)
What does it mean? What version do I have? I am using ubuntu server 64bit and installed update manually with make and make install ...

@Vasago
Copy link

@Vasago Vasago commented on 0513d9c Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using SSL version: OpenSSL 1.0.1e 11 Feb 2013 (library: OpenSSL 1.0.1c 10 May 2012)
Using ACE version: 6.2.1
http://pastebin.com/f16AYKKD

@QAston
Copy link
Contributor Author

@QAston QAston commented on 0513d9c Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like aproblem with ACE library - try updating.

@Vasago
Copy link

@Vasago Vasago commented on 0513d9c Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

6.2.1 is the latest ..

@theknurz
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried ACE6.2.1, 6.2.0, 6.0.3 .. all same error (in BigNumber.cpp:189) while compiling

@xurxogr
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same problem Ubuntu 13.04 + gcc 4.7.3. Tested ACE 6.0.3 and 6.2.0

@lev1976g
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using ACE version 6.0.3 os debian 7 x64 openssl 1.0.1c problem compile error (in BigNumber.cpp:189)

@EgoSumThan
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, this is awkward.

@QAston
Copy link
Contributor Author

@QAston QAston commented on 0513d9c Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://paste2.org/cNdGHnG2

@QAston
Copy link
Contributor Author

@QAston QAston commented on 0513d9c Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try out the patch i've posted, this is definitely not an outdated ace issue, sorry for the inconvenience.

@EgoSumThan
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dedeb5f guys.

Please sign in to comment.