web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compiled on Mac; refs #22

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-02-02 12:04:49 +00:00
parent 440c1c30dd
commit 7fa2ba91f8
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openssl-act-engine/src/CertificateList.cpp
View File

@@ -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());

4
openssl-act-engine/src/engine_sct.cpp
View File

@@ -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());

2
openssl-act-engine/src/makefile.am
View File

@@ -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

1
openssl-act-engine/src/test_engine.cpp
View File

@@ -2,6 +2,7 @@
#include "engine_sct.h"
#include <cstring>
#include <openssl/ssl.h>
#include <openssl/rsa.h>
#include <openssl/engine.h>