summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-06-04 16:14:16 +0000
committerbors <bors@rust-lang.org>2021-06-04 16:14:16 +0000
commitf9ee729a53744048c1c529fefd28de3fd24faa5f (patch)
treea45628e0adcb2b645acc4fe55dc2a37d15314d1e
parentf86dbf242d1406c9f4855a7c420b501030d80d84 (diff)
parent88ec60920441a29173df29b1c4942b065254c4e4 (diff)
downloadrust-libc-f9ee729a53744048c1c529fefd28de3fd24faa5f.tar.gz
Auto merge of #2217 - devnexen:fbsd_timingsafe_api, r=JohnTitor
freebsd introducing timingsafe api (from 12)
-rw-r--r--src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs2
-rw-r--r--src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
index 0c15b8dfcc..2def90089f 100644
--- a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
+++ b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
@@ -229,6 +229,8 @@ extern "C" {
pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
pub fn elf_aux_info(aux: ::c_int, buf: *mut ::c_void, buflen: ::c_int) -> ::c_int;
pub fn setproctitle_fast(fmt: *const ::c_char, ...);
+ pub fn timingsafe_bcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
+ pub fn timingsafe_memcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
}
cfg_if! {
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
index 0aff081c53..b150e04d54 100644
--- a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
+++ b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
@@ -234,6 +234,8 @@ extern "C" {
pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
pub fn elf_aux_info(aux: ::c_int, buf: *mut ::c_void, buflen: ::c_int) -> ::c_int;
pub fn setproctitle_fast(fmt: *const ::c_char, ...);
+ pub fn timingsafe_bcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
+ pub fn timingsafe_memcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
}
cfg_if! {