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

Merge pull request #2327 from ViktoriiaKovalova/add-select-alpn-cb 

Enable set_alpn_select_callback for BoringSSL
parents 96607c65 cf40611e

openssl/src/ssl/callbacks.rs

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ use crate::dh::Dh; 
use crate::ec::EcKey;

use crate::error::ErrorStack;

use crate::pkey::Params;

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

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

use crate::ssl::AlpnError;

use crate::ssl::{

    try_get_session_ctx_index, SniError, Ssl, SslAlert, SslContext, SslContextRef, SslRef,
@@ -178,7 +178,7 @@ where 
    }

}



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

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

pub extern "C" fn raw_alpn_select<F>(

    ssl: *mut ffi::SSL,

    out: *mut *const c_uchar,

openssl/src/ssl/mod.rs

+14 −7
Original line number Diff line number Diff line
@@ -602,17 +602,17 @@ impl SslAlert { 


/// An error returned from an ALPN selection callback.

///

/// Requires OpenSSL 1.0.2 or LibreSSL 2.6.1 or newer.

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

/// Requires BoringSSL or OpenSSL 1.0.2 or LibreSSL 2.6.1 or newer.

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

#[derive(Debug, Copy, Clone, PartialEq, Eq)]

pub struct AlpnError(c_int);



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

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

impl AlpnError {

    /// Terminate the handshake with a fatal alert.

    ///

    /// Requires OpenSSL 1.1.0 or newer.

    #[cfg(ossl110)]

    /// Requires BoringSSL or OpenSSL 1.1.0 or newer.

    #[cfg(any(ossl110, boringssl))]

    pub const ALERT_FATAL: AlpnError = AlpnError(ffi::SSL_TLSEXT_ERR_ALERT_FATAL);



    /// Do not select a protocol, but continue the handshake.
@@ -1267,23 +1267,30 @@ impl SslContextBuilder { 
    /// of those protocols on success. The [`select_next_proto`] function implements the standard

    /// protocol selection algorithm.

    ///

    /// Requires OpenSSL 1.0.2 or LibreSSL 2.6.1 or newer.

    /// Requires BoringSSL or OpenSSL 1.0.2 or LibreSSL 2.6.1 or newer.

    ///

    /// [`SslContextBuilder::set_alpn_protos`]: struct.SslContextBuilder.html#method.set_alpn_protos

    /// [`select_next_proto`]: fn.select_next_proto.html

    #[corresponds(SSL_CTX_set_alpn_select_cb)]

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

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

    pub fn set_alpn_select_callback<F>(&mut self, callback: F)

    where

        F: for<'a> Fn(&mut SslRef, &'a [u8]) -> Result<&'a [u8], AlpnError> + 'static + Sync + Send,

    {

        unsafe {

            self.set_ex_data(SslContext::cached_ex_index::<F>(), callback);

            #[cfg(not(boringssl))]

            ffi::SSL_CTX_set_alpn_select_cb__fixed_rust(

                self.as_ptr(),

                Some(callbacks::raw_alpn_select::<F>),

                ptr::null_mut(),

            );

            #[cfg(boringssl)]

            ffi::SSL_CTX_set_alpn_select_cb(

                self.as_ptr(),

                Some(callbacks::raw_alpn_select::<F>),

                ptr::null_mut(),

            );

        }

    }

openssl/src/ssl/test/mod.rs

+3 −3
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ fn test_connect_with_srtp_ssl() { 
/// Tests that when the `SslStream` is created as a server stream, the protocols

/// are correctly advertised to the client.

#[test]

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

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

fn test_alpn_server_advertise_multiple() {

    let mut server = Server::builder();

    server.ctx().set_alpn_select_callback(|_, client| {
@@ -517,7 +517,7 @@ fn test_alpn_server_advertise_multiple() { 
}



#[test]

#[cfg(ossl110)]

#[cfg(any(ossl110, boringssl))]

fn test_alpn_server_select_none_fatal() {

    let mut server = Server::builder();

    server.ctx().set_alpn_select_callback(|_, client| {
@@ -533,7 +533,7 @@ fn test_alpn_server_select_none_fatal() { 
}



#[test]

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

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

fn test_alpn_server_select_none() {

    static CALLED_BACK: AtomicBool = AtomicBool::new(false);