min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #908 from sfackler/102g-fix 

Flag off constants added in 1.0.2h
This commit is contained in:
Steven Fackler 2018-04-30 21:27:23 -07:00 committed by GitHub
parent 42cbd0111b cc8866ac3c
commit 5b0a0e5692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -10,9 +10,10 @@
* Added `RsaPrivateKeyBuilder` to allow control over initialization of optional components of an RSA
private key.
* Added DER encode/decode support to `SslSession`.
* openssl-sys now provides the `OPENSSL_VERSION_NUMBER` and `OPENSSL_LIBRESSL_VERSION_NUMBER`
environment variables to downstream build scripts which contains the hex-encoded version number
of the OpenSSL or LibreSSL distribution being built against. The other variables are deprecated.
* openssl-sys now provides the `DEP_OPENSSL_VERSION_NUMBER` and
`DEP_OPENSSL_LIBRESSL_VERSION_NUMBER` environment variables to downstream build scripts which
contains the hex-encoded version number of the OpenSSL or LibreSSL distribution being built
against. The other variables are deprecated.
## [v0.10.6] - 2018-03-05

4
openssl-sys/build.rs
View File

@ -437,6 +437,10 @@ See rust-openssl README for more information:
let openssl_version = openssl_version.unwrap();
println!("cargo:version_number={:x}", openssl_version);
if openssl_version >= 0x1_00_02_08_0 {
println!("cargo:rustc-cfg=ossl102h");
}
if openssl_version >= 0x1_01_02_00_0 {
version_error()
} else if openssl_version >= 0x1_01_01_00_0 {

15
openssl-sys/src/ossl10x.rs
View File

@ -1,13 +1,13 @@
use std::io::{self, Write};
use std::mem;
use std::process;
use std::ptr;
use std::sync::{Mutex, MutexGuard};
use std::sync::{Once, ONCE_INIT};
use std::mem;
use std::ptr;
use std::process;
use std::io::{self, Write};
use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t};
#[cfg(not(ossl101))]
use libc::time_t;
use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t};
#[repr(C)]
pub struct stack_st_ASN1_OBJECT {
@ -131,7 +131,7 @@ pub struct DSA {
#[repr(C)]
pub struct ECDSA_SIG {
pub r: *mut BIGNUM,
pub s: *mut BIGNUM
pub s: *mut BIGNUM,
}
#[repr(C)]
@ -719,8 +719,11 @@ pub const CRYPTO_LOCK_X509: c_int = 3;
pub const CRYPTO_LOCK_SSL_CTX: c_int = 12;
pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14;
#[cfg(ossl102h)]
pub const X509_V_ERR_INVALID_CALL: c_int = 65;
#[cfg(ossl102h)]
pub const X509_V_ERR_STORE_LOOKUP: c_int = 66;
#[cfg(ossl102h)]
pub const X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION: c_int = 67;
static mut MUTEXES: *mut Vec<Mutex<()>> = 0 as *mut Vec<Mutex<()>>;