View | Details | Raw Unified | Return to bug 207745
Collapse All | Expand All

(-)b/contrib/wpa/src/crypto/tls_openssl.c (-5 / +5 lines)
Lines 125-131 struct tls_connection { Link Here
125
	X509 *peer_issuer;
125
	X509 *peer_issuer;
126
	X509 *peer_issuer_issuer;
126
	X509 *peer_issuer_issuer;
127
127
128
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
128
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
129
	unsigned char client_random[SSL3_RANDOM_SIZE];
129
	unsigned char client_random[SSL3_RANDOM_SIZE];
130
	unsigned char server_random[SSL3_RANDOM_SIZE];
130
	unsigned char server_random[SSL3_RANDOM_SIZE];
131
#endif
131
#endif
Lines 2229-2235 static int tls_parse_pkcs12(struct tls_data *data, SSL *ssl, PKCS12 *p12, Link Here
2229
	}
2229
	}
2230
2230
2231
	if (certs) {
2231
	if (certs) {
2232
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
2232
#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
2233
		SSL_clear_chain_certs(ssl);
2233
		SSL_clear_chain_certs(ssl);
2234
		while ((cert = sk_X509_pop(certs)) != NULL) {
2234
		while ((cert = sk_X509_pop(certs)) != NULL) {
2235
			X509_NAME_oneline(X509_get_subject_name(cert), buf,
2235
			X509_NAME_oneline(X509_get_subject_name(cert), buf,
Lines 2812-2818 int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn, Link Here
2812
	if (conn == NULL || keys == NULL)
2812
	if (conn == NULL || keys == NULL)
2813
		return -1;
2813
		return -1;
2814
	ssl = conn->ssl;
2814
	ssl = conn->ssl;
2815
#if OPENSSL_VERSION_NUMBER < 0x10100000L
2815
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
2816
	if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
2816
	if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
2817
		return -1;
2817
		return -1;
2818
2818
Lines 2841-2847 int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn, Link Here
2841
#ifndef CONFIG_FIPS
2841
#ifndef CONFIG_FIPS
2842
static int openssl_get_keyblock_size(SSL *ssl)
2842
static int openssl_get_keyblock_size(SSL *ssl)
2843
{
2843
{
2844
#if OPENSSL_VERSION_NUMBER < 0x10100000L
2844
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
2845
	const EVP_CIPHER *c;
2845
	const EVP_CIPHER *c;
2846
	const EVP_MD *h;
2846
	const EVP_MD *h;
2847
	int md_size;
2847
	int md_size;
Lines 2911-2917 static int openssl_tls_prf(struct tls_connection *conn, Link Here
2911
		   "mode");
2911
		   "mode");
2912
	return -1;
2912
	return -1;
2913
#else /* CONFIG_FIPS */
2913
#else /* CONFIG_FIPS */
2914
#if OPENSSL_VERSION_NUMBER < 0x10100000L
2914
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
2915
	SSL *ssl;
2915
	SSL *ssl;
2916
	u8 *rnd;
2916
	u8 *rnd;
2917
	int ret = -1;
2917
	int ret = -1;

Return to bug 207745