diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ustream-openssl.c | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b3fc8c..86e1b07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,12 @@ ELSEIF(WOLFSSL) IF (NOT HAVE_WOLFSSL_SSLSETIORECV) ADD_DEFINITIONS(-DNO_WOLFSSL_SSLSETIO_SEND_RECV) ENDIF() + CHECK_SYMBOL_EXISTS (wolfSSL_X509_check_host + "wolfssl/options.h;wolfssl/ssl.h" + HAVE_WOLFSSL_X509_CHECK_HOST) + IF (NOT HAVE_WOLFSSL_X509_CHECK_HOST) + ADD_DEFINITIONS(-DNO_X509_CHECK_HOST) + ENDIF() ELSE() SET(SSL_SRC ustream-io-openssl.c ustream-openssl.c) SET(SSL_LIB crypto ssl) diff --git a/ustream-openssl.c b/ustream-openssl.c index 21abf61..c830618 100644 --- a/ustream-openssl.c +++ b/ustream-openssl.c @@ -203,7 +203,7 @@ static void ustream_ssl_error(struct ustream_ssl *us, int ret) uloop_timeout_set(&us->error_timer, 0); } -#ifndef WOLFSSL_OPENSSL_H_ +#ifndef NO_X509_CHECK_HOST static bool ustream_ssl_verify_cn(struct ustream_ssl *us, X509 *cert) { @@ -212,10 +212,15 @@ static bool ustream_ssl_verify_cn(struct ustream_ssl *us, X509 *cert) if (!us->peer_cn) return false; +# ifndef WOLFSSL_OPENSSL_H_ ret = X509_check_host(cert, us->peer_cn, 0, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS, NULL); +# else + ret = wolfSSL_X509_check_host(cert, us->peer_cn, 0, 0, NULL); +# endif return ret == 1; } +#endif static void ustream_ssl_verify_cert(struct ustream_ssl *us) { @@ -235,11 +240,12 @@ static void ustream_ssl_verify_cert(struct ustream_ssl *us) return; us->valid_cert = true; +#ifndef NO_X509_CHECK_HOST us->valid_cn = ustream_ssl_verify_cn(us, cert); +#endif X509_free(cert); } -#endif __hidden enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us) { @@ -252,9 +258,7 @@ __hidden enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us) r = SSL_connect(ssl); if (r == 1) { -#ifndef WOLFSSL_OPENSSL_H_ ustream_ssl_verify_cert(us); -#endif return U_SSL_OK; } |