Add OPENSSL_VERSION constants

coolreader18 · coolreader18 · commit a61f0edbfd7b · 2020-03-21T22:28:05.000-05:00
diff --git a/Lib/ssl.py b/Lib/ssl.py
@@ -101,7 +101,7 @@
 import _ssl             # if we can't import it, let the error propagate
 
 # XXX RustPython TODO: provide more of these imports
-# from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION
+from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION
 from _ssl import _SSLContext #, MemoryBIO, SSLSession
 from _ssl import (
     SSLError, #SSLZeroReturnError, SSLWantReadError, SSLWantWriteError,
diff --git a/vm/src/stdlib/ssl.rs b/vm/src/stdlib/ssl.rs
@@ -6,7 +6,9 @@ use crate::obj::objbyteinner::PyBytesLike;
 use crate::obj::objbytes::PyBytesRef;
 use crate::obj::objstr::{PyString, PyStringRef};
 use crate::obj::{objtype::PyClassRef, objweakref::PyWeak};
-use crate::pyobject::{PyClassImpl, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject};
+use crate::pyobject::{
+    IntoPyObject, PyClassImpl, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
+};
 use crate::types::create_type;
 use crate::VirtualMachine;
 
@@ -577,6 +579,19 @@ fn convert_ssl_error(vm: &VirtualMachine, e: ssl::Error) -> PyBaseExceptionRef {
     }
 }
 
+fn parse_version_info(mut n: i64) -> (u8, u8, u8, u8, u8) {
+    let status = (n & 0xF) as u8;
+    n >>= 4;
+    let patch = (n & 0xFF) as u8;
+    n >>= 8;
+    let fix = (n & 0xFF) as u8;
+    n >>= 8;
+    let minor = (n & 0xFF) as u8;
+    n >>= 8;
+    let major = (n & 0xFF) as u8;
+    (major, minor, fix, patch, status)
+}
+
 pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     openssl::init();
     let ctx = &vm.ctx;
@@ -594,6 +609,9 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "get_default_verify_paths" => ctx.new_function(ssl_get_default_verify_paths),
 
         // Constants
+        "OPENSSL_VERSION" => ctx.new_str(openssl::version::version().to_owned()),
+        "OPENSSL_VERSION_NUMBER" => ctx.new_int(openssl::version::number()),
+        "OPENSSL_VERSION_INFO" => parse_version_info(openssl::version::number()).into_pyobject(vm).unwrap(),
         "PROTOCOL_SSLv2" => ctx.new_int(SslVersion::Ssl2 as u32),
         "PROTOCOL_SSLv3" => ctx.new_int(SslVersion::Ssl3 as u32),
         "PROTOCOL_SSLv23" => ctx.new_int(SslVersion::Tls as u32),
