aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/Cargo.toml5
-rw-r--r--openssl-sys/build.rs60
-rw-r--r--openssl-sys/src/lib.rs57
-rw-r--r--openssl-sys/src/openssl_shim.c4
-rw-r--r--openssl-sys/src/ssl_options.rs46
5 files changed, 161 insertions, 11 deletions
diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
index 5ed9d068..437f7fb6 100644
--- a/openssl-sys/Cargo.toml
+++ b/openssl-sys/Cargo.toml
@@ -1,12 +1,12 @@
[package]
name = "openssl-sys"
-version = "0.6.4"
+version = "0.6.5"
authors = ["Alex Crichton <[email protected]>",
"Steven Fackler <[email protected]>"]
license = "MIT"
description = "FFI bindings to OpenSSL"
repository = "https://github.com/sfackler/rust-openssl"
-documentation = "https://sfackler.github.io/rust-openssl/doc/v0.6.4/openssl_sys"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.6.5/openssl_sys"
links = "openssl"
build = "build.rs"
@@ -18,6 +18,7 @@ dtlsv1 = []
dtlsv1_2 = []
sslv2 = []
aes_xts = []
+aes_ctr = []
npn = []
alpn = []
diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs
index c1f12034..b4a00566 100644
--- a/openssl-sys/build.rs
+++ b/openssl-sys/build.rs
@@ -2,7 +2,10 @@ extern crate pkg_config;
extern crate gcc;
use std::env;
+use std::fmt::Write as FmtWrite;
use std::path::PathBuf;
+use std::fs::File;
+use std::io::Write;
fn main() {
let target = env::var("TARGET").unwrap();
@@ -65,7 +68,63 @@ fn main() {
build_openssl_shim(&include_dirs);
}
+macro_rules! import_options {
+ ( $( $name:ident $val:expr )* ) => {
+ &[ $( (stringify!($name),$val), )* ]
+ };
+}
+
+fn generate_options_shim() -> PathBuf {
+ let options: &[(&'static str,u64)]=include!("src/ssl_options.rs");
+ let mut shim = String::new();
+ writeln!(shim,"#include <stdint.h>").unwrap();
+ writeln!(shim,"#include <openssl/ssl.h>").unwrap();
+
+ for &(name,value) in options {
+ writeln!(shim,"#define RUST_{} UINT64_C({})",name,value).unwrap();
+ writeln!(shim,"#ifndef {}",name).unwrap();
+ writeln!(shim,"# define {} 0",name).unwrap();
+ writeln!(shim,"#endif").unwrap();
+ }
+
+ writeln!(shim,"#define COPY_MASK ( \\").unwrap();
+
+ let mut it=options.iter().peekable();
+ while let Some(&(name,_))=it.next() {
+ let eol=match it.peek() {
+ Some(_) => " | \\",
+ None => " )"
+ };
+ writeln!(shim," ((RUST_{0}==(uint64_t)(uint32_t){0})?RUST_{0}:UINT64_C(0)){1}",name,eol).unwrap();
+ }
+
+ writeln!(shim,"long rust_openssl_ssl_ctx_options_rust_to_c(uint64_t rustval) {{").unwrap();
+ writeln!(shim," long cval=rustval&COPY_MASK;").unwrap();
+ for &(name,_) in options {
+ writeln!(shim," if (rustval&RUST_{0}) cval|={0};",name).unwrap();
+ }
+ writeln!(shim," return cval;").unwrap();
+ writeln!(shim,"}}").unwrap();
+
+ writeln!(shim,"uint64_t rust_openssl_ssl_ctx_options_c_to_rust(long cval) {{").unwrap();
+ writeln!(shim," uint64_t rustval=cval&COPY_MASK;").unwrap();
+ for &(name,_) in options {
+ writeln!(shim," if (cval&{0}) rustval|=RUST_{0};",name).unwrap();
+ }
+ writeln!(shim," return rustval;").unwrap();
+ writeln!(shim,"}}").unwrap();
+
+ let out_dir = env::var("OUT_DIR").unwrap();
+ let dest_file = PathBuf::from(&out_dir).join("ssl_ctx_options_shim.c");
+ let mut f = File::create(&dest_file).unwrap();
+
+ f.write_all(shim.as_bytes()).unwrap();
+
+ dest_file
+}
+
fn build_openssl_shim(include_paths: &[PathBuf]) {
+ let options_shim_file = generate_options_shim();
let mut config = gcc::Config::new();
for path in include_paths {
@@ -73,6 +132,7 @@ fn build_openssl_shim(include_paths: &[PathBuf]) {
}
config.file("src/openssl_shim.c")
+ .file(options_shim_file)
.compile("libopenssl_shim.a");
}
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index eb7750f7..0e0ef8a5 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1,6 +1,6 @@
#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
#![allow(dead_code)]
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.4")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.5")]
extern crate libc;
@@ -37,6 +37,7 @@ pub type X509_NAME = c_void;
pub type X509_NAME_ENTRY = c_void;
pub type X509_REQ = c_void;
pub type X509_STORE_CTX = c_void;
+pub type stack_st_X509_EXTENSION = c_void;
#[repr(C)]
pub struct EVP_MD_CTX {
@@ -128,6 +129,8 @@ pub const MBSTRING_UTF8: c_int = MBSTRING_FLAG;
pub const NID_ext_key_usage: c_int = 126;
pub const NID_key_usage: c_int = 83;
+pub const PKCS5_SALT_LEN: c_int = 8;
+
pub const SSL_CTRL_OPTIONS: c_int = 32;
pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77;
@@ -155,6 +158,14 @@ pub const SSL_TLSEXT_ERR_ALERT_WARNING: c_int = 1;
pub const SSL_TLSEXT_ERR_ALERT_FATAL: c_int = 2;
pub const SSL_TLSEXT_ERR_NOACK: c_int = 3;
+macro_rules! import_options {
+ ( $( $name:ident $val:expr )* ) => {
+ $( pub const $name: u64 = $val; )*
+ };
+}
+
+include!("ssl_options.rs");
+
#[cfg(feature = "npn")]
pub const OPENSSL_NPN_UNSUPPORTED: c_int = 0;
#[cfg(feature = "npn")]
@@ -262,8 +273,23 @@ pub fn init() {
}
}
+pub unsafe fn SSL_CTX_set_options(ssl: *mut SSL_CTX, op: u64) -> u64 {
+ rust_openssl_ssl_ctx_options_c_to_rust(SSL_CTX_set_options_shim(ssl, rust_openssl_ssl_ctx_options_rust_to_c(op)))
+}
+
+pub unsafe fn SSL_CTX_get_options(ssl: *mut SSL_CTX) -> u64 {
+ rust_openssl_ssl_ctx_options_c_to_rust(SSL_CTX_get_options_shim(ssl))
+}
+
+pub unsafe fn SSL_CTX_clear_options(ssl: *mut SSL_CTX, op: u64) -> u64 {
+ rust_openssl_ssl_ctx_options_c_to_rust(SSL_CTX_clear_options_shim(ssl, rust_openssl_ssl_ctx_options_rust_to_c(op)))
+}
+
// True functions
extern "C" {
+ fn rust_openssl_ssl_ctx_options_rust_to_c(rustval: u64) -> c_long;
+ fn rust_openssl_ssl_ctx_options_c_to_rust(cval: c_long) -> u64;
+
pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;
pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING;
pub fn ASN1_TIME_free(tm: *mut ASN1_TIME);
@@ -374,16 +400,22 @@ extern "C" {
pub fn EVP_aes_128_ecb() -> *const EVP_CIPHER;
#[cfg(feature = "aes_xts")]
pub fn EVP_aes_128_xts() -> *const EVP_CIPHER;
- // fn EVP_aes_128_ctr() -> EVP_CIPHER;
+ #[cfg(feature = "aes_ctr")]
+ pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER;
// fn EVP_aes_128_gcm() -> EVP_CIPHER;
pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER;
pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER;
#[cfg(feature = "aes_xts")]
pub fn EVP_aes_256_xts() -> *const EVP_CIPHER;
- // fn EVP_aes_256_ctr() -> EVP_CIPHER;
+ #[cfg(feature = "aes_ctr")]
+ pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER;
// fn EVP_aes_256_gcm() -> EVP_CIPHER;
pub fn EVP_rc4() -> *const EVP_CIPHER;
+ pub fn EVP_BytesToKey(typ: *const EVP_CIPHER, md: *const EVP_MD,
+ salt: *const u8, data: *const u8, datalen: c_int,
+ count: c_int, key: *mut u8, iv: *mut u8) -> c_int;
+
pub fn EVP_CIPHER_CTX_new() -> *mut EVP_CIPHER_CTX;
pub fn EVP_CIPHER_CTX_set_padding(ctx: *mut EVP_CIPHER_CTX, padding: c_int) -> c_int;
pub fn EVP_CIPHER_CTX_free(ctx: *mut EVP_CIPHER_CTX);
@@ -445,6 +477,7 @@ extern "C" {
kstr: *mut c_char, klen: c_int,
callback: Option<PasswordCallback>,
user_data: *mut c_void) -> c_int;
+ pub fn PEM_write_bio_PUBKEY(bp: *mut BIO, x: *mut EVP_PKEY) -> c_int;
pub fn PEM_write_bio_X509(bio: *mut BIO, x509: *mut X509) -> c_int;
pub fn PEM_write_bio_X509_REQ(bio: *mut BIO, x509: *mut X509_REQ) -> c_int;
@@ -502,6 +535,9 @@ extern "C" {
pub fn SSL_get_SSL_CTX(ssl: *mut SSL) -> *mut SSL_CTX;
pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const COMP_METHOD;
pub fn SSL_get_peer_certificate(ssl: *mut SSL) -> *mut X509;
+ pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD;
+ pub fn SSL_state_string(ssl: *mut SSL) -> *const c_char;
+ pub fn SSL_state_string_long(ssl: *mut SSL) -> *const c_char;
pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char;
@@ -603,8 +639,12 @@ extern "C" {
pub fn X509_STORE_CTX_get_ex_data(ctx: *mut X509_STORE_CTX, idx: c_int) -> *mut c_void;
pub fn X509V3_EXT_conf_nid(conf: *mut c_void, ctx: *mut X509V3_CTX, ext_nid: c_int, value: *mut c_char) -> *mut X509_EXTENSION;
+ pub fn X509V3_EXT_conf(conf: *mut c_void, ctx: *mut X509V3_CTX, name: *mut c_char, value: *mut c_char) -> *mut X509_EXTENSION;
pub fn X509V3_set_ctx(ctx: *mut X509V3_CTX, issuer: *mut X509, subject: *mut X509, req: *mut X509_REQ, crl: *mut X509_CRL, flags: c_int);
+ pub fn X509_REQ_add_extensions(req: *mut X509_REQ, exts: *mut stack_st_X509_EXTENSION) -> c_int;
+ pub fn X509_REQ_sign(x: *mut X509_REQ, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int;
+
pub fn i2d_RSA_PUBKEY(k: *mut RSA, buf: *const *mut u8) -> c_int;
pub fn d2i_RSA_PUBKEY(k: *const *mut RSA, buf: *const *const u8, len: c_uint) -> *mut RSA;
pub fn i2d_RSAPrivateKey(k: *mut RSA, buf: *const *mut u8) -> c_int;
@@ -615,18 +655,17 @@ extern "C" {
pub fn BIO_eof(b: *mut BIO) -> c_int;
#[link_name = "BIO_set_mem_eof_return_shim"]
pub fn BIO_set_mem_eof_return(b: *mut BIO, v: c_int);
- #[link_name = "SSL_CTX_set_options_shim"]
- pub fn SSL_CTX_set_options(ctx: *mut SSL_CTX, options: c_long) -> c_long;
- #[link_name = "SSL_CTX_get_options_shim"]
- pub fn SSL_CTX_get_options(ctx: *mut SSL_CTX) -> c_long;
- #[link_name = "SSL_CTX_clear_options_shim"]
- pub fn SSL_CTX_clear_options(ctx: *mut SSL_CTX, options: c_long) -> c_long;
+ pub fn SSL_CTX_set_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;
+ pub fn SSL_CTX_get_options_shim(ctx: *mut SSL_CTX) -> c_long;
+ pub fn SSL_CTX_clear_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;
#[link_name = "SSL_CTX_add_extra_chain_cert_shim"]
pub fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long;
#[link_name = "SSL_CTX_set_read_ahead_shim"]
pub fn SSL_CTX_set_read_ahead(ctx: *mut SSL_CTX, m: c_long) -> c_long;
#[link_name = "SSL_set_tlsext_host_name_shim"]
pub fn SSL_set_tlsext_host_name(s: *mut SSL, name: *const c_char) -> c_long;
+ #[link_name = "X509_get_extensions_shim"]
+ pub fn X509_get_extensions(x: *mut X509) -> *mut stack_st_X509_EXTENSION;
}
pub mod probe;
diff --git a/openssl-sys/src/openssl_shim.c b/openssl-sys/src/openssl_shim.c
index 7b4f9c74..f0622d2d 100644
--- a/openssl-sys/src/openssl_shim.c
+++ b/openssl-sys/src/openssl_shim.c
@@ -82,3 +82,7 @@ long SSL_CTX_set_read_ahead_shim(SSL_CTX *ctx, long m) {
long SSL_set_tlsext_host_name_shim(SSL *s, char *name) {
return SSL_set_tlsext_host_name(s, name);
}
+
+STACK_OF(X509_EXTENSION) *X509_get_extensions_shim(X509 *x) {
+ return x->cert_info ? x->cert_info->extensions : NULL;
+}
diff --git a/openssl-sys/src/ssl_options.rs b/openssl-sys/src/ssl_options.rs
new file mode 100644
index 00000000..a1c778ac
--- /dev/null
+++ b/openssl-sys/src/ssl_options.rs
@@ -0,0 +1,46 @@
+import_options!{
+// The following values are directly from recent OpenSSL
+SSL_OP_MICROSOFT_SESS_ID_BUG 0x00000001
+SSL_OP_NETSCAPE_CHALLENGE_BUG 0x00000002
+SSL_OP_LEGACY_SERVER_CONNECT 0x00000004
+SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008
+SSL_OP_TLSEXT_PADDING 0x00000010
+SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020
+SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040
+SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080
+SSL_OP_TLS_D5_BUG 0x00000100
+SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200
+// unused: 0x00000400
+SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800
+SSL_OP_NO_QUERY_MTU 0x00001000
+SSL_OP_COOKIE_EXCHANGE 0x00002000
+SSL_OP_NO_TICKET 0x00004000
+SSL_OP_CISCO_ANYCONNECT 0x00008000
+SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000
+SSL_OP_NO_COMPRESSION 0x00020000
+SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x00040000
+SSL_OP_SINGLE_ECDH_USE 0x00080000
+SSL_OP_SINGLE_DH_USE 0x00100000
+// unused: 0x00200000
+SSL_OP_CIPHER_SERVER_PREFERENCE 0x00400000
+SSL_OP_TLS_ROLLBACK_BUG 0x00800000
+SSL_OP_NO_SSLv2 0x01000000
+SSL_OP_NO_SSLv3 0x02000000
+SSL_OP_NO_DTLSv1 0x04000000
+SSL_OP_NO_TLSv1 0x04000000
+SSL_OP_NO_DTLSv1_2 0x08000000
+SSL_OP_NO_TLSv1_2 0x08000000
+SSL_OP_NO_TLSv1_1 0x10000000
+SSL_OP_NETSCAPE_CA_DN_BUG 0x20000000
+SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x40000000
+SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000
+
+// The following values were in 32-bit range in old OpenSSL
+SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x100000000
+SSL_OP_MSIE_SSLV2_RSA_PADDING 0x200000000
+SSL_OP_PKCS1_CHECK_1 0x400000000
+SSL_OP_PKCS1_CHECK_2 0x800000000
+
+// The following values were redefined to 0 for security reasons
+SSL_OP_EPHEMERAL_RSA 0x0
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 14:45:11 +0000