mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-28 16:24:39 +02:00
Merge pull request #746 from tgauth/update-dependencies
Update dependency versions
This commit is contained in:
Tess Gauthier
GitHub
commit
d8b0147df2
@ -207,13 +207,13 @@
|
||||
/* #undef HAVE_ADDR_V6_IN_UTMPX */
|
||||
|
||||
/* Define to 1 if you have the `arc4random' function. */
|
||||
#define HAVE_ARC4RANDOM 1
|
||||
/* #undef HAVE_ARC4RANDOM */
|
||||
|
||||
/* Define to 1 if you have the `arc4random_buf' function. */
|
||||
#define HAVE_ARC4RANDOM_BUF 1
|
||||
/* #undef HAVE_ARC4RANDOM_BUF */
|
||||
|
||||
/* Define to 1 if you have the `arc4random_uniform' function. */
|
||||
#define HAVE_ARC4RANDOM_UNIFORM 1
|
||||
/* #undef HAVE_ARC4RANDOM_UNIFORM */
|
||||
|
||||
/* Define to 1 if you have the `asprintf' function. */
|
||||
/* #undef HAVE_ASPRINTF */
|
||||
|
||||
@ -103,7 +103,10 @@
|
||||
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\glob.c" />
|
||||
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\strcasestr.c" />
|
||||
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\strndup.c" />
|
||||
<ClCompile Include="..\..\..\openbsd-compat\arc4random_uniform.c" />
|
||||
<ClCompile Include="..\..\..\openbsd-compat\bsd-getentropy.c" />
|
||||
<ClCompile Include="..\..\..\openbsd-compat\bsd-pselect.c" />
|
||||
<ClCompile Include="..\..\..\openbsd-compat\bsd-timegm.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\base64.h" />
|
||||
@ -137,6 +140,7 @@
|
||||
<ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\sys-queue.h" />
|
||||
<ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\sys-tree.h" />
|
||||
<ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\vis.h" />
|
||||
<ClInclude Include="..\..\..\openbsd-compat\arc4random_win.h" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{DD483F7D-C553-4740-BC1A-903805AD0174}</ProjectGuid>
|
||||
|
||||
@ -219,6 +219,15 @@
|
||||
<ClCompile Include="..\..\..\openbsd-compat\bsd-pselect.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\openbsd-compat\bsd-timegm.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\openbsd-compat\arc4random_uniform.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\openbsd-compat\bsd-getentropy.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\base64.h">
|
||||
@ -314,5 +323,8 @@
|
||||
<ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\vis.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\openbsd-compat\arc4random_win.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
<OpenSSH-Src-Path>$(SolutionDir)..\..\..\</OpenSSH-Src-Path>
|
||||
<OpenSSH-Bin-Path>$(SolutionDir)..\..\..\bin\</OpenSSH-Bin-Path>
|
||||
<OpenSSH-Lib-Path>$(SolutionDir)lib\</OpenSSH-Lib-Path>
|
||||
<LibreSSLVersion>3.8.2.0</LibreSSLVersion>
|
||||
<ZLibVersion>1.3</ZLibVersion>
|
||||
<fido2Version>1.14.0</fido2Version>
|
||||
<LibreSSLVersion>3.9.2.0</LibreSSLVersion>
|
||||
<ZLibVersion>1.3.1</ZLibVersion>
|
||||
<fido2Version>1.15.0</fido2Version>
|
||||
<!--libcbor version is not used in the build; it is needed for pipeline compliance tasks-->
|
||||
<libcborVersion>0.10.1</libcborVersion>
|
||||
<LibreSSL-Path>$(SolutionDir)\LibreSSL\sdk\</LibreSSL-Path>
|
||||
|
||||
@ -191,7 +191,7 @@ nanosleep(const struct timespec *req, struct timespec *rem)
|
||||
* Copyright (c) 2009, 2010 NoMachine
|
||||
* All rights reserved
|
||||
*/
|
||||
static int
|
||||
int
|
||||
gettimeofday(struct timeval *tv, void *tz)
|
||||
{
|
||||
union {
|
||||
@ -213,7 +213,7 @@ gettimeofday(struct timeval *tv, void *tz)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
void
|
||||
explicit_bzero(void *b, size_t len)
|
||||
{
|
||||
SecureZeroMemory(b, len);
|
||||
|
||||
@ -88,12 +88,16 @@ static struct _rsx {
|
||||
|
||||
static inline int _rs_allocate(struct _rs **, struct _rsx **);
|
||||
static inline void _rs_forkdetect(void);
|
||||
#ifdef WINDOWS
|
||||
#include "arc4random_win.h"
|
||||
#else
|
||||
#include "arc4random.h"
|
||||
#endif /* WINDOWS*/
|
||||
|
||||
static inline void _rs_rekey(u_char *dat, size_t datlen);
|
||||
|
||||
static inline void
|
||||
_rs_init(u_char *buf, size_t n)
|
||||
_rs_init(u_char* buf, size_t n)
|
||||
{
|
||||
if (n < KEYSZ + IVSZ)
|
||||
return;
|
||||
|
||||
78
openbsd-compat/arc4random_win.h
Normal file
78
openbsd-compat/arc4random_win.h
Normal file
@ -0,0 +1,78 @@
|
||||
/* $OpenBSD: arc4random_win.h,v 1.6 2016/06/30 12:17:29 bcook Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996, David Mazieres <dm@uun.org>
|
||||
* Copyright (c) 2008, Damien Miller <djm@openbsd.org>
|
||||
* Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
|
||||
* Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Stub functions for portability.
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
static volatile HANDLE arc4random_mtx = NULL;
|
||||
|
||||
/*
|
||||
* Initialize the mutex on the first lock attempt. On collision, each thread
|
||||
* will attempt to allocate a mutex and compare-and-swap it into place as the
|
||||
* global mutex. On failure to swap in the global mutex, the mutex is closed.
|
||||
*/
|
||||
#define _ARC4_LOCK() { \
|
||||
if (!arc4random_mtx) { \
|
||||
HANDLE p = CreateMutex(NULL, FALSE, NULL); \
|
||||
if (InterlockedCompareExchangePointer((void **)&arc4random_mtx, (void *)p, NULL)) \
|
||||
CloseHandle(p); \
|
||||
} \
|
||||
WaitForSingleObject(arc4random_mtx, INFINITE); \
|
||||
} \
|
||||
|
||||
#define _ARC4_UNLOCK() ReleaseMutex(arc4random_mtx)
|
||||
|
||||
static inline void
|
||||
_getentropy_fail(void)
|
||||
{
|
||||
TerminateProcess(GetCurrentProcess(), 0);
|
||||
}
|
||||
|
||||
static inline int
|
||||
_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
|
||||
{
|
||||
*rsp = VirtualAlloc(NULL, sizeof(**rsp),
|
||||
MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
|
||||
if (*rsp == NULL)
|
||||
return (-1);
|
||||
|
||||
*rsxp = VirtualAlloc(NULL, sizeof(**rsxp),
|
||||
MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
|
||||
if (*rsxp == NULL) {
|
||||
VirtualFree(*rsp, 0, MEM_RELEASE);
|
||||
*rsp = NULL;
|
||||
return (-1);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
static inline void
|
||||
_rs_forkhandler(void)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void
|
||||
_rs_forkdetect(void)
|
||||
{
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user