abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-25 09:46:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #556 from J-Feng/fix-engine-build-error

Browse Source 
Fix SKF and SDF engines build error
This commit is contained in:
Zhi Guan
2018-08-09 22:11:38 +08:00
committed by GitHub
parent abb5a7f801 366f612047
commit 83538da804
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engines/sdf_dummy.c
View File

@@ -52,6 +52,7 @@
#include <string.h> #include <string.h>
#include <openssl/sgd.h> #include <openssl/sgd.h>
#include <openssl/sdf.h> #include <openssl/sdf.h>
#include <openssl/engine.h>
static char *deviceHandle = "SDF Device Handle"; static char *deviceHandle = "SDF Device Handle";
static char *sessionHandle = "SDF Session Handle"; static char *sessionHandle = "SDF Session Handle";
@@ -471,7 +472,7 @@ int SDF_GenerateAgreementDataWithECC(
ECCrefPublicKey *pucSponsorTmpPublicKey, ECCrefPublicKey *pucSponsorTmpPublicKey,
void **phAgreementHandle) void **phAgreementHandle)
{ {
// any output public key ? // any output public key ?
if (!phAgreementHandle || !(*phAgreementHandle)) if (!phAgreementHandle || !(*phAgreementHandle))
return SDR_INARGERR; return SDR_INARGERR;
*phAgreementHandle = agreementHandle; *phAgreementHandle = agreementHandle;
@@ -509,7 +510,7 @@ int SDF_GenerateAgreementDataAndKeyWithECC(
ECCrefPublicKey *pucResponseTmpPublicKey, ECCrefPublicKey *pucResponseTmpPublicKey,
void **phKeyHandle) void **phKeyHandle)
{ {
// any output // any output
if (!phKeyHandle || !(*phKeyHandle)) if (!phKeyHandle || !(*phKeyHandle))
return SDR_INARGERR; return SDR_INARGERR;
*phKeyHandle = keyHandle; *phKeyHandle = keyHandle;
@@ -766,3 +767,10 @@ int SDF_DeleteFile(
{ {
return SDR_OK; return SDR_OK;
} }
static int bind(ENGINE *e, const char *id)
{
return 1;
}
IMPLEMENT_DYNAMIC_BIND_FN(bind)
IMPLEMENT_DYNAMIC_CHECK_FN()

8
engines/skf_dummy.c
View File

@@ -53,6 +53,7 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/gmskf.h> #include <openssl/gmskf.h>
#include <openssl/engine.h>
static char *hDeviceHandle = "hDeviceHandle"; static char *hDeviceHandle = "hDeviceHandle";
static char *hApplication = "hApplication"; static char *hApplication = "hApplication";
@@ -962,3 +963,10 @@ ULONG DEVAPI SKF_CloseHandle(
{ {
return SAR_OK; return SAR_OK;
} }
static int bind(ENGINE *e, const char *id)
{
return 1;
}
IMPLEMENT_DYNAMIC_BIND_FN(bind)
IMPLEMENT_DYNAMIC_CHECK_FN()