Skip to content

Commit e914bd4

Browse files
committed
Enable PKCS11 Support
- 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.
1 parent 8bb672a commit e914bd4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

contrib/win32/openssh/config.h.vs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
#define DISABLE_WTMPX 1
136136

137137
/* Enable for PKCS#11 support */
138-
/* #undef ENABLE_PKCS11 */
138+
#define ENABLE_PKCS11 1
139139

140140
/* File names may not contain backslash characters */
141141
/* #undef FILESYSTEM_NO_BACKSLASH */

contrib/win32/win32compat/inc/dlfcn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ HMODULE dlopen(const char *filename, int flags);
88

99
int dlclose(HMODULE handle);
1010

11-
FARPROC dlsym(HMODULE handle, const char *symbol);
11+
void * dlsym(HMODULE handle, const char *symbol);

contrib/win32/win32compat/misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ dlclose(HMODULE handle)
234234
return 0;
235235
}
236236

237-
FARPROC
237+
void *
238238
dlsym(HMODULE handle, const char *symbol)
239239
{
240240
return GetProcAddress(handle, symbol);
@@ -1761,4 +1761,4 @@ do { \
17611761
free(cmdline);
17621762

17631763
return ret;
1764-
}
1764+
}

0 commit comments

Comments
 (0)