LibreSSL 3.9: fix CRYPTO_malloc/free signatures

botovq · botovq · commit 83940d14e30e · 2024-02-14T10:06:10.000+01:00
diff --git a/openssl-sys/src/crypto.rs b/openssl-sys/src/crypto.rs
@@ -57,7 +57,7 @@ pub type CRYPTO_EX_free = unsafe extern "C" fn(
     argp: *mut c_void,
 );
 
-#[cfg(ossl110)]
+#[cfg(any(ossl110, libressl390))]
 #[inline]
 #[track_caller]
 pub unsafe fn OPENSSL_malloc(num: usize) -> *mut c_void {
@@ -68,7 +68,7 @@ pub unsafe fn OPENSSL_malloc(num: usize) -> *mut c_void {
     )
 }
 
-#[cfg(not(ossl110))]
+#[cfg(not(any(ossl110, libressl390)))]
 #[inline]
 #[track_caller]
 pub unsafe fn OPENSSL_malloc(num: c_int) -> *mut c_void {
@@ -79,7 +79,7 @@ pub unsafe fn OPENSSL_malloc(num: c_int) -> *mut c_void {
     )
 }
 
-#[cfg(ossl110)]
+#[cfg(any(ossl110, libressl390))]
 #[inline]
 #[track_caller]
 pub unsafe fn OPENSSL_free(addr: *mut c_void) {
@@ -90,7 +90,7 @@ pub unsafe fn OPENSSL_free(addr: *mut c_void) {
     )
 }
 
-#[cfg(not(ossl110))]
+#[cfg(not(any(ossl110, libressl390)))]
 #[inline]
 pub unsafe fn OPENSSL_free(addr: *mut c_void) {
     CRYPTO_free(addr)
diff --git a/openssl-sys/src/handwritten/crypto.rs b/openssl-sys/src/handwritten/crypto.rs
@@ -57,7 +57,7 @@ extern "C" {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl390))] {
         extern "C" {
             pub fn CRYPTO_malloc(num: size_t, file: *const c_char, line: c_int) -> *mut c_void;
             pub fn CRYPTO_free(buf: *mut c_void, file: *const c_char, line: c_int);

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ pub type CRYPTO_EX_free = unsafe extern "C" fn(`
`57`	`57`	`argp: *mut c_void,`
`58`	`58`	`);`
`59`	`59`
`60`		`-#[cfg(ossl110)]`
	`60`	`+#[cfg(any(ossl110, libressl390))]`
`61`	`61`	`#[inline]`
`62`	`62`	`#[track_caller]`
`63`	`63`	`pub unsafe fn OPENSSL_malloc(num: usize) -> *mut c_void {`
`@@ -68,7 +68,7 @@ pub unsafe fn OPENSSL_malloc(num: usize) -> *mut c_void {`
`68`	`68`	`)`
`69`	`69`	`}`
`70`	`70`
`71`		`-#[cfg(not(ossl110))]`
	`71`	`+#[cfg(not(any(ossl110, libressl390)))]`
`72`	`72`	`#[inline]`
`73`	`73`	`#[track_caller]`
`74`	`74`	`pub unsafe fn OPENSSL_malloc(num: c_int) -> *mut c_void {`
`@@ -79,7 +79,7 @@ pub unsafe fn OPENSSL_malloc(num: c_int) -> *mut c_void {`
`79`	`79`	`)`
`80`	`80`	`}`
`81`	`81`
`82`		`-#[cfg(ossl110)]`
	`82`	`+#[cfg(any(ossl110, libressl390))]`
`83`	`83`	`#[inline]`
`84`	`84`	`#[track_caller]`
`85`	`85`	`pub unsafe fn OPENSSL_free(addr: *mut c_void) {`
`@@ -90,7 +90,7 @@ pub unsafe fn OPENSSL_free(addr: *mut c_void) {`
`90`	`90`	`)`
`91`	`91`	`}`
`92`	`92`
`93`		`-#[cfg(not(ossl110))]`
	`93`	`+#[cfg(not(any(ossl110, libressl390)))]`
`94`	`94`	`#[inline]`
`95`	`95`	`pub unsafe fn OPENSSL_free(addr: *mut c_void) {`
`96`	`96`	`CRYPTO_free(addr)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ extern "C" {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`cfg_if! {`
`60`		`- if #[cfg(ossl110)] {`
	`60`	`+ if #[cfg(any(ossl110, libressl390))] {`
`61`	`61`	`extern "C" {`
`62`	`62`	`pub fn CRYPTO_malloc(num: size_t, file: const c_char, line: c_int) -> mut c_void;`
`63`	`63`	`pub fn CRYPTO_free(buf: mut c_void, file: const c_char, line: c_int);`