tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-26 07:25:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added implementation for dlopen, dlclose, dlsym and dlerror

Browse Source
This commit is contained in:
manojampalam 2016-03-23 21:54:35 -07:00
parent 0958df5875
commit 5a60b811fe
6 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/win32/openssh/win32iocompat.vcxproj
View File

@ -163,6 +163,7 @@
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\w32posix.h" /> <ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\w32posix.h" />
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\poll.h" /> <ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\poll.h" />
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\sys\statvfs.h" /> <ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\sys\statvfs.h" />
<ClInclude Include="..\win32compat\inc\dlfcn.h" />
<ClInclude Include="..\win32compat\inc\syslog.h" /> <ClInclude Include="..\win32compat\inc\syslog.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

3
contrib/win32/openssh/win32iocompat.vcxproj.filters
View File

@ -50,6 +50,9 @@
<ClInclude Include="..\win32compat\inc\syslog.h"> <ClInclude Include="..\win32compat\inc\syslog.h">
<Filter>inc</Filter> <Filter>inc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\win32compat\inc\dlfcn.h">
<Filter>inc</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="inc"> <Filter Include="inc">

11
contrib/win32/win32compat/inc/dlfcn.h Normal file
View File

@ -0,0 +1,11 @@
#pragma once
#include <Windows.h>
#define RTLD_NOW 0
#define dlerror() GetLastError()
HMODULE *dlopen(const char *filename, int flags);
int dlclose(HMODULE *handle);
FARPROC *dlsym(HMODULE *handle, const char *symbol);

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

@ -60,4 +60,17 @@ int statvfs(const char *path, struct statvfs *buf) {
int fstatvfs(int fd, struct statvfs *buf) { int fstatvfs(int fd, struct statvfs *buf) {
errno = ENOSYS; errno = ENOSYS;
return -1; return -1;
}
#include "inc\dlfcn.h"
HMODULE *dlopen(const char *filename, int flags) {
return LoadLibraryA(filename);
}
int dlclose(HMODULE *handle) {
FreeLibrary(handle);
}
FARPROC *dlsym(HMODULE *handle, const char *symbol) {
return GetProcAddress(handle, symbol);
} }

39
ssh-pkcs11.c
View File

@ -28,11 +28,7 @@
#include <string.h> #include <string.h>
#ifdef WIN32_FIXME
#include <Winbase.h>
#else
#include <dlfcn.h> #include <dlfcn.h>
#endif /*WIN32_FIXME*/
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"
@ -114,11 +110,7 @@ pkcs11_provider_finalize(struct pkcs11_provider *p)
p->valid = 0; p->valid = 0;
p->function_list = NULL; p->function_list = NULL;
#ifdef WIN32_FIXME
FreeLibrary(p -> handle);
#else
dlclose(p->handle); dlclose(p->handle);
#endif /*WIN32_FIXME*/
} }
/* /*
@ -589,28 +581,6 @@ pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp)
goto fail; goto fail;
} }
/* open shared pkcs11-libarary */ /* open shared pkcs11-libarary */
#ifdef WIN32_FIXME
handle = LoadLibrary(provider_id);
if (handle == NULL)
{
error("Cannot load OpenSC library. Error code is: %u.\n"
"Please ensure that path to these libraries is properly "
"set in your PATH variable.\n", GetLastError());
goto fail;
}
getfunctionlist = (CK_RV(*)(CK_FUNCTION_LIST **))GetProcAddress(handle, "C_GetFunctionList");
if (getfunctionlist == NULL)
{
error("Cannot load OpenSC library. Error code is: %u.\n", GetLastError());
goto fail;
}
#else
if ((handle = dlopen(provider_id, RTLD_NOW)) == NULL) { if ((handle = dlopen(provider_id, RTLD_NOW)) == NULL) {
error("dlopen %s failed: %s", provider_id, dlerror()); error("dlopen %s failed: %s", provider_id, dlerror());
goto fail; goto fail;
@ -619,8 +589,7 @@ pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp)
error("dlsym(C_GetFunctionList) failed: %s", dlerror()); error("dlsym(C_GetFunctionList) failed: %s", dlerror());
goto fail; goto fail;
} }
#endif /*WIN32_FIXME*/
p = xcalloc(1, sizeof(*p)); p = xcalloc(1, sizeof(*p));
p->name = xstrdup(provider_id); p->name = xstrdup(provider_id);
p->handle = handle; p->handle = handle;
@ -705,13 +674,9 @@ fail:
free(p->slotinfo); free(p->slotinfo);
free(p); free(p);
} }
#ifdef WIN32_FIXME
if (handle)
FreeLibrary(handle);
#else
if (handle) if (handle)
dlclose(handle); dlclose(handle);
#endif/*WIN32_FIXME*/
return (-1); return (-1);
} }

2
ssh_api.c
View File

@ -382,7 +382,7 @@ _ssh_send_banner(struct ssh *ssh, char **bannerp)
char buf[256]; char buf[256];
int r; int r;
#ifndef WIN32_FIXME #ifndef WIN32_FIXME//R
snprintf(buf, sizeof buf, "SSH-2.0-%.100s\r\n", SSH_VERSION); snprintf(buf, sizeof buf, "SSH-2.0-%.100s\r\n", SSH_VERSION);
#else #else
snprintf(buf, sizeof buf, "SSH-2.0-%.100sp1 Microsoft_Win32_port %s\r\n", SSH_VERSION, __DATE__ ); snprintf(buf, sizeof buf, "SSH-2.0-%.100sp1 Microsoft_Win32_port %s\r\n", SSH_VERSION, __DATE__ );