tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enable PKCS11 Support (#331)

Browse Source 
- Enable use of PKCS11 library files by adjusting central configuration file.
- Modified dlsym() to return a void pointer instead of an int which is consistent with POSIX. The previous return type caused an issue with 32-bit builds with PKCS11 enabled.
This commit is contained in:
Bryan Berns 2019-05-21 16:36:24 -04:00 committed by Manoj Ampalam
parent bfd4ddf194
commit 44ba5483cd
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win32/openssh/config.h.vs
View File

@ -135,7 +135,7 @@
#define DISABLE_WTMPX 1 #define DISABLE_WTMPX 1
/* Enable for PKCS#11 support */ /* Enable for PKCS#11 support */
/* #undef ENABLE_PKCS11 */ #define ENABLE_PKCS11 1
/* File names may not contain backslash characters */ /* File names may not contain backslash characters */
/* #undef FILESYSTEM_NO_BACKSLASH */ /* #undef FILESYSTEM_NO_BACKSLASH */

4
contrib/win32/win32compat/inc/dlfcn.h
View File

@ -5,7 +5,5 @@
HMODULE dlopen(const char *filename, int flags); HMODULE dlopen(const char *filename, int flags);
int dlclose(HMODULE handle); int dlclose(HMODULE handle);
void * dlsym(HMODULE handle, const char *symbol);
FARPROC dlsym(HMODULE handle, const char *symbol);
char * dlerror(); char * dlerror();

2
contrib/win32/win32compat/misc.c
View File

@ -247,7 +247,7 @@ dlclose(HMODULE handle)
return 0; return 0;
} }
FARPROC void *
dlsym(HMODULE handle, const char *symbol) dlsym(HMODULE handle, const char *symbol)
{ {
void *ptr = GetProcAddress(handle, symbol); void *ptr = GetProcAddress(handle, symbol);