DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

OpenSSL: Implement tls_connection_get_keys() for OpenSSL 1.1.0

Browse source 
This needs to use the new accessor functions since the SSL session
details are not directly accessible anymore.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-07-28 00:58:39 +03:00
parent 690e543e8a
commit 005c5dcf43
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/crypto/tls_openssl.c
View file

@ -116,6 +116,11 @@ struct tls_connection {
X509 *peer_cert; X509 *peer_cert;
X509 *peer_issuer; X509 *peer_issuer;
X509 *peer_issuer_issuer; X509 *peer_issuer_issuer;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
unsigned char client_random[SSL3_RANDOM_SIZE];
unsigned char server_random[SSL3_RANDOM_SIZE];
#endif
}; };
@ -2646,6 +2651,7 @@ int tls_connection_get_keys(void *ssl_ctx, struct tls_connection *conn,
if (conn == NULL || keys == NULL) if (conn == NULL || keys == NULL)
return -1; return -1;
ssl = conn->ssl; ssl = conn->ssl;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL) if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
return -1; return -1;
@ -2654,6 +2660,18 @@ int tls_connection_get_keys(void *ssl_ctx, struct tls_connection *conn,
keys->client_random_len = SSL3_RANDOM_SIZE; keys->client_random_len = SSL3_RANDOM_SIZE;
keys->server_random = ssl->s3->server_random; keys->server_random = ssl->s3->server_random;
keys->server_random_len = SSL3_RANDOM_SIZE; keys->server_random_len = SSL3_RANDOM_SIZE;
#else
if (ssl == NULL)
return -1;
os_memset(keys, 0, sizeof(*keys));
keys->client_random = conn->client_random;
keys->client_random_len = SSL_get_client_random(
ssl, conn->client_random, sizeof(conn->client_random));
keys->server_random = conn->server_random;
keys->server_random_len = SSL_get_server_random(
ssl, conn->server_random, sizeof(conn->server_random));
#endif
return 0; return 0;
#endif /* CONFIG_FIPS */ #endif /* CONFIG_FIPS */