Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes to get openpgpsdk version working on OSX.

Browse source 
- switch to OSX10.6 for upgraded SSL, with different fn signature.
 - correct library paths in libretroshare.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-07-27 12:28:40 +00:00
parent 515a0abdb3
commit f34f617f00
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/libretroshare.pro
View file

@ -320,10 +320,15 @@ mac {
QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs
UPNPC_DIR = ../../../miniupnpc-1.0 UPNPC_DIR = ../../../miniupnpc-1.0
GPG_ERROR_DIR = ../../../../libgpg-error-1.7 #GPG_ERROR_DIR = ../../../../libgpg-error-1.7
GPGME_DIR = ../../../../gpgme-1.1.8 #GPGME_DIR = ../../../../gpgme-1.1.8
OPENPGPSDK_DIR = ../../openpgpsdk/src
INCLUDEPATH += . $${UPNPC_DIR} INCLUDEPATH += . $${UPNPC_DIR}
INCLUDEPATH += $${OPENPGPSDK_DIR}
#../openpgpsdk
#INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src #INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
} }

6
libretroshare/src/pqi/sslfns.cc
View file

@ -586,8 +586,10 @@ X509 *loadX509FromDER(const uint8_t *ptr, uint32_t len)
X509 *tmp = NULL; X509 *tmp = NULL;
#ifdef __APPLE__ #ifdef __APPLE__
// This depends on which version you are compiling for... OSX10.5 doesn't have consts (old OpenSSL!) // This depends on which version you are compiling for... OSX10.5 doesn't have consts (old OpenSSL!)
unsigned char **certptr = (unsigned char **) &ptr; // With the Advent of Openpgpsdk, we are forced to move to OSX10.6 for a newer OpenSSL (probably a good thing).
//const unsigned char **certptr = (const unsigned char **) &ptr; // So we can change this around.
//unsigned char **certptr = (unsigned char **) &ptr;
const unsigned char **certptr = (const unsigned char **) &ptr;
#else #else
const unsigned char **certptr = (const unsigned char **) &ptr; const unsigned char **certptr = (const unsigned char **) &ptr;
#endif #endif