Merge pull request #380 from Yoric/master (9511a9bc) · Commits · Public Repositories / Rust Openssl

openssl-sys/src/lib.rs

+9 −0

Original line number	Diff line number	Diff line
		@@ -259,6 +259,12 @@ 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;

		pub const SSLEAY_VERSION : c_int = 0;
		pub const SSLEAY_CFLAGS : c_int = 2;
		pub const SSLEAY_BUILT_ON : c_int = 3;
		pub const SSLEAY_PLATFORM : c_int = 4;
		pub const SSLEAY_DIR : c_int = 5;

		#[cfg(any(feature = "npn", feature = "alpn"))]
		pub const OPENSSL_NPN_UNSUPPORTED: c_int = 0;
		#[cfg(any(feature = "npn", feature = "alpn"))]
		@@ -769,6 +775,9 @@ extern "C" {
		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;
		pub fn d2i_RSAPrivateKey(k: const mut RSA, buf: const const u8, len: c_uint) -> *mut RSA;

		pub fn SSLeay() -> c_long;
		pub fn SSLeay_version(key: c_int) -> *const c_char;
		}

		pub mod probe;

openssl/src/lib.rs

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,3 +25,4 @@ pub mod dh;
		pub mod ssl;
		pub mod x509;
		pub mod nid;
		pub mod version;

openssl/src/version.rs

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		use ffi;
		use std::ffi::CStr;

		/// OPENSSL_VERSION_NUMBER is a numeric release version identifier:
		///
		/// `MNNFFPPS: major minor fix patch status`
		///
		/// The status nibble has one of the values 0 for development, 1 to e for betas 1 to 14, and f for release.
		///
		/// for example
		///
		/// `0x000906000 == 0.9.6 dev`
		/// `0x000906023 == 0.9.6b beta 3`
		/// `0x00090605f == 0.9.6e release`
		///
		/// Versions prior to 0.9.3 have identifiers < 0x0930. Versions between 0.9.3 and 0.9.5 had a version identifier with this interpretation:
		///
		/// `MMNNFFRBB major minor fix final beta/patch`
		///
		/// for example
		///
		/// `0x000904100 == 0.9.4 release`
		/// `0x000905000 == 0.9.5 dev`
		///
		/// Version 0.9.5a had an interim interpretation that is like the current one, except the patch level got the highest bit set, to keep continuity. The number was therefore 0x0090581f
		///
		/// The return value of this function can be compared to the macro to make sure that the correct version of the library has been loaded, especially when using DLLs on Windows systems.
		pub fn number() -> i64 {
		unsafe { ffi::SSLeay() as i64 }
		}


		/// The text variant of the version number and the release date. For example, "OpenSSL 0.9.5a 1 Apr 2000".
		pub fn version() -> &'static str {
		unsafe { CStr::from_ptr(ffi::SSLeay_version(ffi::SSLEAY_VERSION)).to_str().unwrap() }
		}

		/// The compiler flags set for the compilation process in the form "compiler: ..." if available or
		/// "compiler: information not available" otherwise.
		pub fn c_flags() -> &'static str {
		unsafe { CStr::from_ptr(ffi::SSLeay_version(ffi::SSLEAY_CFLAGS)).to_str().unwrap() }
		}

		/// The date of the build process in the form "built on: ..." if available or "built on: date not available" otherwise.
		pub fn built_on() -> &'static str {
		unsafe { CStr::from_ptr(ffi::SSLeay_version(ffi::SSLEAY_BUILT_ON)).to_str().unwrap() }
		}

		/// The "Configure" target of the library build in the form "platform: ..." if available or "platform: information not available" otherwise.
		pub fn platform() -> &'static str {
		unsafe { CStr::from_ptr(ffi::SSLeay_version(ffi::SSLEAY_PLATFORM)).to_str().unwrap() }
		}

		/// The "OPENSSLDIR" setting of the library build in the form "OPENSSLDIR: "..."" if available or "OPENSSLDIR: N/A" otherwise.
		pub fn dir() -> &'static str {
		unsafe { CStr::from_ptr(ffi::SSLeay_version(ffi::SSLEAY_DIR)).to_str().unwrap() }
		}

		/// This test ensures that we do not segfault when calling the functions of this module
		/// and that the strings respect a reasonable format.
		#[test]
		fn test_versions() {
		println!("Number: '{}'", number());
		println!("Version: '{}'", version());
		println!("C flags: '{}'", c_flags());
		println!("Built on: '{}'", built_on());
		println!("Platform: '{}'", platform());
		println!("Dir: '{}'", dir());

		assert!(number() > 0);
		assert!(version().starts_with("OpenSSL"));
		assert!(c_flags().starts_with("compiler:"));
		assert!(built_on().starts_with("built on:"));
		assert!(dir().starts_with("OPENSSLDIR:"));
		}
		No newline at end of file