|
Lines 3163-3169
static int tls_parse_pkcs12(struct tls_data *data, SSL *ssl, PKCS12 *p12,
Link Here
|
| 3163 |
} |
3163 |
} |
| 3164 |
|
3164 |
|
| 3165 |
if (certs) { |
3165 |
if (certs) { |
| 3166 |
#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
3166 |
#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 3167 |
SSL_clear_chain_certs(ssl); |
3167 |
SSL_clear_chain_certs(ssl); |
| 3168 |
while ((cert = sk_X509_pop(certs)) != NULL) { |
3168 |
while ((cert = sk_X509_pop(certs)) != NULL) { |
| 3169 |
X509_NAME_oneline(X509_get_subject_name(cert), buf, |
3169 |
X509_NAME_oneline(X509_get_subject_name(cert), buf, |
|
Lines 3746-3752
int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,
Link Here
|
| 3746 |
if (conn == NULL || keys == NULL) |
3746 |
if (conn == NULL || keys == NULL) |
| 3747 |
return -1; |
3747 |
return -1; |
| 3748 |
ssl = conn->ssl; |
3748 |
ssl = conn->ssl; |
| 3749 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
3749 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 3750 |
if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL) |
3750 |
if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL) |
| 3751 |
return -1; |
3751 |
return -1; |
| 3752 |
|
3752 |
|
|
Lines 3775-3781
int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,
Link Here
|
| 3775 |
#ifndef CONFIG_FIPS |
3775 |
#ifndef CONFIG_FIPS |
| 3776 |
static int openssl_get_keyblock_size(SSL *ssl) |
3776 |
static int openssl_get_keyblock_size(SSL *ssl) |
| 3777 |
{ |
3777 |
{ |
| 3778 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
3778 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 3779 |
const EVP_CIPHER *c; |
3779 |
const EVP_CIPHER *c; |
| 3780 |
const EVP_MD *h; |
3780 |
const EVP_MD *h; |
| 3781 |
int md_size; |
3781 |
int md_size; |
|
Lines 3845-3851
static int openssl_tls_prf(struct tls_connection *conn,
Link Here
|
| 3845 |
"mode"); |
3845 |
"mode"); |
| 3846 |
return -1; |
3846 |
return -1; |
| 3847 |
#else /* CONFIG_FIPS */ |
3847 |
#else /* CONFIG_FIPS */ |
| 3848 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
3848 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 3849 |
SSL *ssl; |
3849 |
SSL *ssl; |
| 3850 |
u8 *rnd; |
3850 |
u8 *rnd; |
| 3851 |
int ret = -1; |
3851 |
int ret = -1; |
|
Lines 4328-4334
int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,
Link Here
|
| 4328 |
|
4328 |
|
| 4329 |
wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1); |
4329 |
wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1); |
| 4330 |
|
4330 |
|
| 4331 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
4331 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 4332 |
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) |
4332 |
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) |
| 4333 |
if (os_strstr(buf, ":ADH-")) { |
4333 |
if (os_strstr(buf, ":ADH-")) { |
| 4334 |
/* |
4334 |
/* |
|
Lines 4917-4923
static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len,
Link Here
|
| 4917 |
struct tls_connection *conn = arg; |
4917 |
struct tls_connection *conn = arg; |
| 4918 |
int ret; |
4918 |
int ret; |
| 4919 |
|
4919 |
|
| 4920 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
4920 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 4921 |
if (conn == NULL || conn->session_ticket_cb == NULL) |
4921 |
if (conn == NULL || conn->session_ticket_cb == NULL) |
| 4922 |
return 0; |
4922 |
return 0; |
| 4923 |
|
4923 |
|
| 4924 |
- |
|
|
