|
Lines 1000-1006
void * tls_init(const struct tls_config *conf)
Link Here
|
| 1000 |
#ifndef OPENSSL_NO_ENGINE |
1000 |
#ifndef OPENSSL_NO_ENGINE |
| 1001 |
wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine"); |
1001 |
wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine"); |
| 1002 |
ERR_load_ENGINE_strings(); |
1002 |
ERR_load_ENGINE_strings(); |
|
|
1003 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 1003 |
ENGINE_load_dynamic(); |
1004 |
ENGINE_load_dynamic(); |
|
|
1005 |
#else |
| 1006 |
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL); |
| 1007 |
#endif |
| 1004 |
|
1008 |
|
| 1005 |
if (conf && |
1009 |
if (conf && |
| 1006 |
(conf->opensc_engine_path || conf->pkcs11_engine_path || |
1010 |
(conf->opensc_engine_path || conf->pkcs11_engine_path || |
|
Lines 1118-1124
static int tls_engine_init(struct tls_connection *conn, const char *engine_id,
Link Here
|
| 1118 |
|
1122 |
|
| 1119 |
ERR_clear_error(); |
1123 |
ERR_clear_error(); |
| 1120 |
#ifdef ANDROID |
1124 |
#ifdef ANDROID |
|
|
1125 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 1121 |
ENGINE_load_dynamic(); |
1126 |
ENGINE_load_dynamic(); |
|
|
1127 |
#else |
| 1128 |
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL); |
| 1129 |
#endif |
| 1122 |
#endif |
1130 |
#endif |
| 1123 |
conn->engine = ENGINE_by_id(engine_id); |
1131 |
conn->engine = ENGINE_by_id(engine_id); |
| 1124 |
if (!conn->engine) { |
1132 |
if (!conn->engine) { |
|
Lines 3506-3512
struct wpabuf * tls_connection_decrypt(void *tls_ctx,
Link Here
|
| 3506 |
|
3514 |
|
| 3507 |
int tls_connection_resumed(void *ssl_ctx, struct tls_connection *conn) |
3515 |
int tls_connection_resumed(void *ssl_ctx, struct tls_connection *conn) |
| 3508 |
{ |
3516 |
{ |
|
|
3517 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 3509 |
return conn ? SSL_cache_hit(conn->ssl) : 0; |
3518 |
return conn ? SSL_cache_hit(conn->ssl) : 0; |
|
|
3519 |
#else |
| 3520 |
return conn ? SSL_session_reused(conn->ssl) : 0; |
| 3521 |
#endif |
| 3510 |
} |
3522 |
} |
| 3511 |
|
3523 |
|
| 3512 |
|
3524 |
|
