Skip to content

Commit ee6cb8b

Browse files
committed
Move OSSL_PARAM definitions to new file
1 parent e77c613 commit ee6cb8b

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

openssl-sys/src/handwritten/evp.rs

-13
Original file line numberDiff line numberDiff line change
@@ -652,16 +652,3 @@ extern "C" {
652652
pub fn EVP_EncodeBlock(dst: *mut c_uchar, src: *const c_uchar, src_len: c_int) -> c_int;
653653
pub fn EVP_DecodeBlock(dst: *mut c_uchar, src: *const c_uchar, src_len: c_int) -> c_int;
654654
}
655-
656-
extern "C" {
657-
#[cfg(ossl300)]
658-
pub fn OSSL_PARAM_construct_uint(key: *const c_char, buf: *mut c_uint) -> OSSL_PARAM;
659-
#[cfg(ossl300)]
660-
pub fn OSSL_PARAM_construct_utf8_string(
661-
key: *const c_char,
662-
buf: *mut c_char,
663-
bsize: size_t,
664-
) -> OSSL_PARAM;
665-
#[cfg(ossl300)]
666-
pub fn OSSL_PARAM_construct_end() -> OSSL_PARAM;
667-
}

openssl-sys/src/handwritten/mod.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub use self::hmac::*;
1515
pub use self::kdf::*;
1616
pub use self::object::*;
1717
pub use self::ocsp::*;
18+
pub use self::params::*;
1819
pub use self::pem::*;
1920
pub use self::pkcs12::*;
2021
pub use self::pkcs7::*;
@@ -51,6 +52,7 @@ mod hmac;
5152
mod kdf;
5253
mod object;
5354
mod ocsp;
55+
mod params;
5456
mod pem;
5557
mod pkcs12;
5658
mod pkcs7;
@@ -68,4 +70,4 @@ mod tls1;
6870
mod types;
6971
mod x509;
7072
mod x509_vfy;
71-
mod x509v3;
73+
mod x509v3;

openssl-sys/src/handwritten/params.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
use super::super::*;
2+
use libc::*;
3+
4+
extern "C" {
5+
#[cfg(ossl300)]
6+
pub fn OSSL_PARAM_construct_uint(key: *const c_char, buf: *mut c_uint) -> OSSL_PARAM;
7+
#[cfg(ossl300)]
8+
pub fn OSSL_PARAM_construct_utf8_string(
9+
key: *const c_char,
10+
buf: *mut c_char,
11+
bsize: size_t,
12+
) -> OSSL_PARAM;
13+
#[cfg(ossl300)]
14+
pub fn OSSL_PARAM_construct_end() -> OSSL_PARAM;
15+
}

0 commit comments

Comments
 (0)