Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bearssl: remove incorrect const on variable that is modified #7133

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions .travis.yml
Expand Up @@ -26,6 +26,7 @@ cache:
directories:
- $HOME/wolfssl-4.7.0-stable
- $HOME/mesalink-1.0.0
- $HOME/bearssl-0.6

env:
global:
Expand Down Expand Up @@ -134,6 +135,16 @@ jobs:
- libpsl-dev
- libbrotli-dev
- libzstd-dev
- env:
- T=debug-bearssl C="--with-bearssl" BEARSSL="yes"
addons:
apt:
<<: *common_apt
packages:
- *common_packages
- libpsl-dev
- libbrotli-dev
- libzstd-dev
- env:
- T=novalgrind LIBRESSL=yes C="--with-openssl=$HOME/libressl" LD_LIBRARY_PATH=/home/travis/libressl/lib:/usr/local/lib
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
Expand Down
46 changes: 24 additions & 22 deletions lib/vtls/bearssl.c
Expand Up @@ -300,7 +300,7 @@ static CURLcode bearssl_connect_step1(struct Curl_easy *data,
struct ssl_connect_data *connssl = &conn->ssl[sockindex];
struct ssl_backend_data *backend = connssl->backend;
const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile);
const char * const hostname = SSL_HOST_NAME();
const char *hostname = SSL_HOST_NAME();
const bool verifypeer = SSL_CONN_CONFIG(verifypeer);
const bool verifyhost = SSL_CONN_CONFIG(verifyhost);
CURLcode ret;
Expand Down Expand Up @@ -840,30 +840,32 @@ static CURLcode bearssl_sha256sum(const unsigned char *input,
}

const struct Curl_ssl Curl_ssl_bearssl = {
{ CURLSSLBACKEND_BEARSSL, "bearssl" },
{ CURLSSLBACKEND_BEARSSL, "bearssl" }, /* info */
0,
sizeof(struct ssl_backend_data),

Curl_none_init,
Curl_none_cleanup,
bearssl_version,
Curl_none_check_cxn,
Curl_none_shutdown,
bearssl_data_pending,
bearssl_random,
Curl_none_cert_status_request,
bearssl_connect,
bearssl_connect_nonblocking,
Curl_ssl_getsock,
bearssl_get_internals,
bearssl_close,
Curl_none_close_all,
bearssl_session_free,
Curl_none_set_engine,
Curl_none_set_engine_default,
Curl_none_engines_list,
Curl_none_false_start,
bearssl_sha256sum
Curl_none_init, /* init */
Curl_none_cleanup, /* cleanup */
bearssl_version, /* version */
Curl_none_check_cxn, /* check_cxn */
Curl_none_shutdown, /* shutdown */
bearssl_data_pending, /* data_pending */
bearssl_random, /* random */
Curl_none_cert_status_request, /* cert_status_request */
bearssl_connect, /* connect */
bearssl_connect_nonblocking, /* connect_nonblocking */
Curl_ssl_getsock, /* getsock */
bearssl_get_internals, /* get_internals */
bearssl_close, /* close_one */
Curl_none_close_all, /* close_all */
bearssl_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */
Curl_none_set_engine_default, /* set_engine_default */
Curl_none_engines_list, /* engines_list */
Curl_none_false_start, /* false_start */
bearssl_sha256sum, /* sha256sum */
NULL, /* associate_connection */
NULL /* disassociate_connection */
};

#endif /* USE_BEARSSL */
14 changes: 14 additions & 0 deletions scripts/travis/before_script.sh
Expand Up @@ -175,4 +175,18 @@ if [ $TRAVIS_OS_NAME = linux ]; then
sudo make install

fi

if [ "$BEARSSL" = "yes" ]; then
if [ ! -e $HOME/bearssl-0.6/Makefile ]; then
cd $HOME
curl -LO https://bearssl.org/bearssl-0.6.tar.gz
tar -xzf bearssl-0.6.tar.gz
cd bearssl-0.6
make
fi
cd $HOME/bearssl-0.6
sudo cp inc/*.h /usr/local/include
sudo cp build/libbearssl.* /usr/local/lib
fi

fi
6 changes: 6 additions & 0 deletions scripts/travis/script.sh
Expand Up @@ -76,6 +76,12 @@ if [ "$T" = "debug-rustls" ]; then
make "TFLAGS=HTTPS !313" test-nonflaky
fi

if [ "$T" = "debug-bearssl" ]; then
./configure --enable-debug --enable-werror $C
make
make "TFLAGS=-n !313" test-nonflaky
fi

if [ "$T" = "novalgrind" ]; then
./configure --enable-werror $C
make
Expand Down