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

Add dl wrapper

Browse Source
This commit is contained in:
Zhi Guan
2022-11-02 12:21:02 +08:00
parent 86a5f4a257
commit 562ba9bb74
5 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sdf/sdf_int.h
View File

@@ -11,11 +11,10 @@
#ifndef SDFUTIL_SDF_METH_H
#define SDFUTIL_SDF_METH_H
#include <gmssl/dylib.h>
#include "sdf.h"
#ifdef WIN32
#include <windows.h>
#endif
typedef int (*SDF_OpenDevice_FuncPtr)(
void **phDeviceHandle);
@@ -350,11 +349,8 @@ typedef int (*SDF_DeleteObject_FuncPtr)(
typedef struct sdf_method_st {
char *name;
#ifdef WIN32
HMODULE dso;
#else
void *dso;
#endif
dylib_handle_t dso;
SDF_OpenDevice_FuncPtr OpenDevice;
SDF_CloseDevice_FuncPtr CloseDevice;
SDF_OpenSession_FuncPtr OpenSession;

25
src/sdf/sdf_meth.c
View File

@@ -11,22 +11,13 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef WIN32
#include <windows.h>
#else
#include <dlfcn.h>
#endif
#include <gmssl/dylib.h>
#include "sdf_int.h"
#define SDFerr(a,b)
#ifdef WIN32
#define SDF_METHOD_BIND_FUNCTION_EX(func,name) \
sdf->func = (SDF_##func##_FuncPtr)GetProcAddress(sdf->dso, "SDF_"#name)
#else
#define SDF_METHOD_BIND_FUNCTION_EX(func,name) \
sdf->func = (SDF_##func##_FuncPtr)dlsym(sdf->dso, "SDF_"#name)
#endif
sdf->func = (SDF_##func##_FuncPtr)dylib_get_function(sdf->dso, "SDF_"#name)
#define SDF_METHOD_BIND_FUNCTION(func) \
SDF_METHOD_BIND_FUNCTION_EX(func,func)
@@ -42,19 +33,11 @@ SDF_METHOD *SDF_METHOD_load_library(const char *so_path)
}
memset(sdf, 0, sizeof(*sdf));
#ifdef WIN32
if ((sdf->dso = LoadLibraryA(so_path)) == NULL) {
if (!(sdf->dso = dylib_load_library(so_path))) {
fprintf(stderr, "%s %d: %s\n", __FILE__, __LINE__, dylib_error_str());
goto end;
}
#else
if (!(sdf->dso = dlopen(so_path, 0/*RTLD_LAZY*/))) { // FIXME: dlfcn.h, dlopen, RTLD_LAZY not in windows!
fprintf(stderr, "%s %d: %s\n", __FILE__, __LINE__, dlerror());
SDFerr(SDF_F_SDF_METHOD_LOAD_LIBRARY, SDF_R_DSO_LOAD_FAILURE);
goto end;
}
#endif
SDF_METHOD_BIND_FUNCTION(OpenDevice);
SDF_METHOD_BIND_FUNCTION(CloseDevice);
SDF_METHOD_BIND_FUNCTION(OpenSession);

11
src/skf/skf_int.h
View File

@@ -11,12 +11,10 @@
#ifndef SKFUTIL_SKF_INT_H
#define SKFUTIL_SKF_INT_H
#include <gmssl/dylib.h>
#include "../sgd.h"
#include "skf.h"
#ifdef WIN32
#include <windows.h>
#endif
typedef ULONG (DEVAPI *SKF_WaitForDevEvent_FuncPtr)(
@@ -476,11 +474,8 @@ typedef ULONG (DEVAPI *SKF_CloseHandle_FuncPtr)(
typedef struct skf_method_st {
char *name;
#ifdef WIN32
HMODULE dso;
#else
void *dso;
#endif
dylib_handle_t dso;
SKF_WaitForDevEvent_FuncPtr WaitForDevEvent;
SKF_CancelWaitForDevEvent_FuncPtr CancelWaitForDevEvent;
SKF_EnumDev_FuncPtr EnumDev;

22
src/skf/skf_meth.c
View File

@@ -11,24 +11,15 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef WIN32
#include <windows.h>
#else
#include <dlfcn.h>
#endif
#include <gmssl/dylib.h>
#include "skf.h"
#include "skf_ext.h"
#include "skf_int.h"
#define SKFerr(e,r)
#ifdef WIN32
#define SKF_METHOD_BIND_FUNCTION_EX(func,name) \
skf->func = (SKF_##func##_FuncPtr)GetProcAddress(skf->dso, "SKF_"#name)
#else
#define SKF_METHOD_BIND_FUNCTION_EX(func,name) \
skf->func = (SKF_##func##_FuncPtr)dlsym(skf->dso, "SKF_"#name)
#endif
skf->func = (SKF_##func##_FuncPtr)dylib_get_function(skf->dso, "SKF_"#name)
#define SKF_METHOD_BIND_FUNCTION(func) \
SKF_METHOD_BIND_FUNCTION_EX(func,func)
@@ -43,17 +34,10 @@ SKF_METHOD *SKF_METHOD_load_library(const char *so_path)
SKFerr(SKF_F_SKF_METHOD_LOAD_LIBRARY, ERR_R_MALLOC_FAILURE);
goto end;
}
#ifdef WIN32
if ((skf->dso = LoadLibraryA(so_path)) == NULL) {
goto end;
}
#else
if (!(skf->dso = dlopen(so_path, 0/*RTLD_LAZY*/))) {//FIXME:dlopen not in windows
if (!(skf->dso = dylib_load_library(so_path))) {
SKFerr(SKF_F_SKF_METHOD_LOAD_LIBRARY, SKF_R_DSO_LOAD_FAILURE);
goto end;
}
#endif
SKF_METHOD_BIND_FUNCTION(WaitForDevEvent);
SKF_METHOD_BIND_FUNCTION(CancelWaitForDevEvent);