From 7fa2ba91f8b36479ba099677ee890463984f1675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 2 Feb 2011 12:04:49 +0000
Subject: [PATCH] compiled on Mac; refs #22

---
 openssl-act-engine/configure.in            | 2 ++
 openssl-act-engine/src/CertificateList.cpp | 3 ++-
 openssl-act-engine/src/engine_sct.cpp      | 4 +++-
 openssl-act-engine/src/makefile.am         | 2 +-
 openssl-act-engine/src/test_engine.cpp     | 1 +
 swisssurfer/src/qmake.pro.in               | 4 +---
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/openssl-act-engine/configure.in b/openssl-act-engine/configure.in
index 1501130..ebeb403 100644
--- a/openssl-act-engine/configure.in
+++ b/openssl-act-engine/configure.in
@@ -72,6 +72,8 @@ case ${host} in
   ;;
   (*mingw*) LDFLAGS+=" -L../../actlibrary/mingw32-i586/Release"
   ;;
+  (i386-apple-darwin*) LDFLAGS+=" -L../../actlibrary/MacOSX-10.5-x86_64/Release"
+  ;;
   (*) AC_MSG_ERROR([Unknown Host: $host])
   ;;
 esac
diff --git a/openssl-act-engine/src/CertificateList.cpp b/openssl-act-engine/src/CertificateList.cpp
index 2172d28..7a606aa 100644
--- a/openssl-act-engine/src/CertificateList.cpp
+++ b/openssl-act-engine/src/CertificateList.cpp
@@ -4,6 +4,7 @@
 #include "SlotList.h"
 #include "SecOpGuard.h"
 
+#include <openssl/ssl.h>
 #include <openssl/objects.h>
 #include <openssl/crypto.h>
 #include <openssl/engine.h>
@@ -129,7 +130,7 @@ void CertificateList::init(SlotList& slots)
 	for(cert_map_t::const_iterator it = cert_temp_map.begin(); it != cert_temp_map.end();++it)		
 	{
 		const act::Blob& certblob = it->first;
-		const unsigned char *cbp = &certblob[0];
+		unsigned char *cbp = const_cast<unsigned char*>(&certblob[0]);
 	
 		cert_p->cert = d2i_X509(NULL, &cbp, certblob.size());
 		
diff --git a/openssl-act-engine/src/engine_sct.cpp b/openssl-act-engine/src/engine_sct.cpp
index cc31dc0..141ddd5 100644
--- a/openssl-act-engine/src/engine_sct.cpp
+++ b/openssl-act-engine/src/engine_sct.cpp
@@ -26,6 +26,8 @@
 
 #include <cstring>
 
+#include <openssl/ssl.h>
+
 EVP_PKEY *SecureTokenEngine::encapsule_CardKey(CardKey *ck)
 {
 	EVP_PKEY* pk(EVP_PKEY_new());
@@ -155,7 +157,7 @@ int SecureTokenEngine::loadCertCtrl(ENGINE *e, load_cert_params *p)
 		return NULL;
 	
 	const act::Blob& certblob = co.getCertBlob();
-	const unsigned char *cbp = &certblob[0];
+	unsigned char *cbp = const_cast<unsigned char*>(&certblob[0]);
 	
 	p->cert = d2i_X509(NULL, &cbp, certblob.size());
 
diff --git a/openssl-act-engine/src/makefile.am b/openssl-act-engine/src/makefile.am
index f3ee7c5..20344c5 100644
--- a/openssl-act-engine/src/makefile.am
+++ b/openssl-act-engine/src/makefile.am
@@ -22,6 +22,6 @@ libengine_act_la_LDFLAGS = -version-info @LIB_VERSION@
 libengine_act_la_LIBADD = -lact -ldl
 
 test_engine_SOURCES = test_engine.cpp
-test_engine_LDADD = -lssl
+test_engine_LDADD = -lssl -lcrypto
 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/openssl-act-engine/src/test_engine.cpp b/openssl-act-engine/src/test_engine.cpp
index 9522355..13ccb33 100644
--- a/openssl-act-engine/src/test_engine.cpp
+++ b/openssl-act-engine/src/test_engine.cpp
@@ -2,6 +2,7 @@
 #include "engine_sct.h"
 
 #include <cstring>
+#include <openssl/ssl.h>
 #include <openssl/rsa.h>
 #include <openssl/engine.h>
 
diff --git a/swisssurfer/src/qmake.pro.in b/swisssurfer/src/qmake.pro.in
index 60805ae..419839f 100644
--- a/swisssurfer/src/qmake.pro.in
+++ b/swisssurfer/src/qmake.pro.in
@@ -1,14 +1,12 @@
 QT += webkit network gui
 CONFIG += debug
-QMAKE_LIBS += -lproxyface -lcryptoki++ -lssl
+QMAKE_LIBS += -lproxyface -lcryptoki++ -lssl -lcrypto
 QMAKE_INCDIR += ../../qt/qt-everywhere-opensource-src-4.6.3/include/Qt \
                 ../../openssl-act-engine/src/
 
 unix {
-  QMAKE_LIBS += -lproxy
 }
 macx {
-  QMAKE_LIBS += -lproxy
   QMAKE_INCDIR += /opt/local/include
   QMAKE_LIBDIR += /opt/local/lib
   CONFIG += x86