kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[Win32] Prefer Cryptography Next Generation API

Browse source 
[BCryptGenRandom] is available since Windows Vista / Windows
Server 2008.

Regarding [CryptGenRandom]:
> This API is deprecated. New and existing software should start
> using Cryptography Next Generation APIs. Microsoft may remove
> this API in future releases.

[BCryptGenRandom]: https://docs.microsoft.com/en-us/windows/win32/api/bcrypt/nf-bcrypt-bcryptgenrandom
[CryptGenRandom]: https://docs.microsoft.com/en-us/windows/win32/api/wincrypt/nf-wincrypt-cryptgenrandom
This commit is contained in:
Nobuyoshi Nakada 2021-09-24 17:06:10 +09:00
parent b8327fb8b1
commit e0ef4899f3
Notes: git 2021-10-02 21:22:53 +09:00 
Merged: https://github.com/ruby/ruby/pull/4924
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1115,7 +1115,7 @@ main()
AC_CHECK_FUNCS(cygwin_conv_path) AC_CHECK_FUNCS(cygwin_conv_path)
AC_LIBOBJ([langinfo]) AC_LIBOBJ([langinfo])
], ],
[mingw*], [ LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi $LIBS" [mingw*], [ LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi -lbcrypt $LIBS"
ac_cv_header_pwd_h=no ac_cv_header_pwd_h=no
ac_cv_header_utime_h=no ac_cv_header_utime_h=no
ac_cv_header_sys_ioctl_h=no ac_cv_header_sys_ioctl_h=no

22
random.c
View file

@ -42,6 +42,7 @@
# include <winsock2.h> # include <winsock2.h>
# include <windows.h> # include <windows.h>
# include <wincrypt.h> # include <wincrypt.h>
# include <bcrypt.h>
#endif #endif
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
@ -544,6 +545,7 @@ fill_random_bytes_syscall(void *buf, size_t size, int unused)
#endif #endif
} }
#elif defined(_WIN32) #elif defined(_WIN32)
# if defined(CRYPT_VERIFYCONTEXT)
STATIC_ASSERT(sizeof_HCRYPTPROV, sizeof(HCRYPTPROV) == sizeof(size_t)); STATIC_ASSERT(sizeof_HCRYPTPROV, sizeof(HCRYPTPROV) == sizeof(size_t));
/* Although HCRYPTPROV is not a HANDLE, it looks like /* Although HCRYPTPROV is not a HANDLE, it looks like
@ -561,7 +563,7 @@ release_crypt(void *p)
} }
static int static int
fill_random_bytes_syscall(void *seed, size_t size, int unused) fill_random_bytes_crypt(void *seed, size_t size)
{ {
static HCRYPTPROV perm_prov; static HCRYPTPROV perm_prov;
HCRYPTPROV prov = perm_prov, old_prov; HCRYPTPROV prov = perm_prov, old_prov;
@ -588,6 +590,24 @@ fill_random_bytes_syscall(void *seed, size_t size, int unused)
CryptGenRandom(prov, size, seed); CryptGenRandom(prov, size, seed);
return 0; return 0;
} }
# else
# define fill_random_bytes_crypt(seed, size) -1
# endif
static int
fill_random_bytes_bcrypt(void *seed, size_t size)
{
if (!BCryptGenRandom(NULL, seed, size, BCRYPT_USE_SYSTEM_PREFERRED_RNG))
return 0;
return -1;
}
static int
fill_random_bytes_syscall(void *seed, size_t size, int unused)
{
if (fill_random_bytes_bcrypt(seed, size) == 0) return 0;
return fill_random_bytes_crypt(seed, size);
}
#elif defined HAVE_GETRANDOM #elif defined HAVE_GETRANDOM
static int static int
fill_random_bytes_syscall(void *seed, size_t size, int need_secure) fill_random_bytes_syscall(void *seed, size_t size, int need_secure)

2
win32/Makefile.sub
View file

@ -277,7 +277,7 @@ LIBS = user32.lib advapi32.lib shell32.lib ws2_32.lib
!if $(MSC_VER) >= 1400 !if $(MSC_VER) >= 1400
LIBS = $(LIBS) iphlpapi.lib LIBS = $(LIBS) iphlpapi.lib
!endif !endif
LIBS = $(LIBS) imagehlp.lib shlwapi.lib $(EXTLIBS) LIBS = $(LIBS) imagehlp.lib shlwapi.lib bcrypt.lib $(EXTLIBS)
!endif !endif
!if !defined(MISSING) !if !defined(MISSING)
MISSING = crypt.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj win32/win32.obj win32/file.obj setproctitle.obj MISSING = crypt.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj win32/win32.obj win32/file.obj setproctitle.obj