Unverified Commit d68077d2 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1400 from jplatte/once_cell 

Switch from lazy_static to once_cell
parents 7225dbbc cef3a3fa

.circleci/config.yml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.34.0

        default: 1.36.0

      minimal_build:

        type: boolean

        default: false
@@ -175,7 +175,7 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.34.0

        default: 1.36.0

    macos:

      xcode: "12.2.0"

    environment:

.github/workflows/ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ jobs: 
    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update --no-self-update 1.34.0 && rustup default 1.34.0

        run: rustup update --no-self-update 1.36.0 && rustup default 1.36.0

      - name: Get rust version

        id: rust-version

        run: echo "::set-output name=version::$(rustc --version)"

openssl/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ vendored = ['openssl-sys/vendored'] 
bitflags = "1.0"

cfg-if = "1.0"

foreign-types = "0.3.1"

lazy_static = "1"

libc = "0.2"

once_cell = "1.5.2"



openssl-sys = { version = "0.9.60", path = "../openssl-sys" }

openssl/src/lib.rs

+1 −2
Original line number Diff line number Diff line
@@ -116,9 +116,8 @@ extern crate bitflags; 
extern crate cfg_if;

#[macro_use]

extern crate foreign_types;

#[macro_use]

extern crate lazy_static;

extern crate libc;

extern crate once_cell;

extern crate openssl_sys as ffi;



#[cfg(test)]

openssl/src/ssl/callbacks.rs

+10 −6
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ use error::ErrorStack; 
use pkey::Params;

#[cfg(any(ossl102, libressl261))]

use ssl::AlpnError;

#[cfg(ossl111)]

use ssl::{ClientHelloResponse, ExtensionContext};

use ssl::{

    SniError, Ssl, SslAlert, SslContext, SslContextRef, SslRef, SslSession, SslSessionRef,

    SESSION_CTX_INDEX,

    try_get_session_ctx_index, SniError, Ssl, SslAlert, SslContext, SslContextRef, SslRef,

    SslSession, SslSessionRef,

};

#[cfg(ossl111)]

use ssl::{ClientHelloResponse, ExtensionContext};

use util::ForeignTypeRefExt;

#[cfg(ossl111)]

use x509::X509Ref;
@@ -355,9 +355,11 @@ pub unsafe extern "C" fn raw_new_session<F>( 
where

    F: Fn(&mut SslRef, SslSession) + 'static + Sync + Send,

{

    let session_ctx_index =

        try_get_session_ctx_index().expect("BUG: session context index initialization failed");

    let ssl = SslRef::from_ptr_mut(ssl);

    let callback = ssl

        .ex_data(*SESSION_CTX_INDEX)

        .ex_data(*session_ctx_index)

        .expect("BUG: session context missing")

        .ex_data(SslContext::cached_ex_index::<F>())

        .expect("BUG: new session callback missing") as *const F;
@@ -401,9 +403,11 @@ pub unsafe extern "C" fn raw_get_session<F>( 
where

    F: Fn(&mut SslRef, &[u8]) -> Option<SslSession> + 'static + Sync + Send,

{

    let session_ctx_index =

        try_get_session_ctx_index().expect("BUG: session context index initialization failed");

    let ssl = SslRef::from_ptr_mut(ssl);

    let callback = ssl

        .ex_data(*SESSION_CTX_INDEX)

        .ex_data(*session_ctx_index)

        .expect("BUG: session context missing")

        .ex_data(SslContext::cached_ex_index::<F>())

        .expect("BUG: get session callback missing") as *const F;