tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix duplicate symbols from posix_compat, openbsd_compat with libcrypto (#593)

This commit is contained in:
Marc-André Moreau 2022-04-08 17:03:18 -04:00 committed by GitHub
parent 9598cec2fc
commit 89cec9823c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,13 +206,13 @@
/* #undef HAVE_ADDR_V6_IN_UTMPX */ /* #undef HAVE_ADDR_V6_IN_UTMPX */
/* Define to 1 if you have the `arc4random' function. */ /* Define to 1 if you have the `arc4random' function. */
/* #undef HAVE_ARC4RANDOM */ #define HAVE_ARC4RANDOM 1
/* Define to 1 if you have the `arc4random_buf' function. */ /* Define to 1 if you have the `arc4random_buf' function. */
/* #undef HAVE_ARC4RANDOM_BUF */ #define HAVE_ARC4RANDOM_BUF 1
/* Define to 1 if you have the `arc4random_uniform' function. */ /* Define to 1 if you have the `arc4random_uniform' function. */
/* #undef HAVE_ARC4RANDOM_UNIFORM */ #define HAVE_ARC4RANDOM_UNIFORM 1
/* Define to 1 if you have the `asprintf' function. */ /* Define to 1 if you have the `asprintf' function. */
/* #undef HAVE_ASPRINTF */ /* #undef HAVE_ASPRINTF */

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

@ -190,7 +190,7 @@ nanosleep(const struct timespec *req, struct timespec *rem)
* Copyright (c) 2009, 2010 NoMachine * Copyright (c) 2009, 2010 NoMachine
* All rights reserved * All rights reserved
*/ */
int static int
gettimeofday(struct timeval *tv, void *tz) gettimeofday(struct timeval *tv, void *tz)
{ {
union { union {
@ -212,7 +212,7 @@ gettimeofday(struct timeval *tv, void *tz)
return 0; return 0;
} }
void static void
explicit_bzero(void *b, size_t len) explicit_bzero(void *b, size_t len)
{ {
SecureZeroMemory(b, len); SecureZeroMemory(b, len);
@ -1480,7 +1480,7 @@ localtime_r(const time_t *timep, struct tm *result)
return localtime_s(result, timep) == 0 ? result : NULL; return localtime_s(result, timep) == 0 ? result : NULL;
} }
void static void
freezero(void *ptr, size_t sz) freezero(void *ptr, size_t sz)
{ {
if (ptr == NULL) if (ptr == NULL)