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

Merge pull request #952 from rumpelsepp/patch-1

Fix build with openssl 1.1.1 and no-psk
parents 6440ee04 321c076a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
use ffi;
use foreign_types::ForeignType;
use foreign_types::ForeignTypeRef;
#[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
#[cfg(any(ossl111, not(osslconf = "OPENSSL_NO_PSK")))]
use libc::c_char;
#[cfg(ossl111)]
use libc::size_t;
use libc::{c_int, c_uchar, c_uint, c_void};
#[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
#[cfg(any(ossl111, not(osslconf = "OPENSSL_NO_PSK")))]
use std::ffi::CStr;
use std::mem;
use std::ptr;