wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

addressed review comments

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-06-18 10:49:24 +09:00
parent 951de64e2c
commit 2bbf7cc0fb
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@@ -1873,10 +1873,10 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap)
ctx->noPskDheKe = 1; ctx->noPskDheKe = 1;
#endif #endif
#if defined(WOLFSSL_QT) #if defined(WOLFSSL_QT) && !defined(NO_PSK)
/* Qt retrieves supported cipher list at initialization /* Qt retrieves supported cipher list at initialization
* from get_cipher_compat(). * from get_cipher_compat().
* Qt doesn't not allow to use a cipher if it is not in the supported list. * Qt doesn't allow to use a cipher if it is not in the supported list.
* Therefore, we need to enable PSK cipher at the beginning. * Therefore, we need to enable PSK cipher at the beginning.
*/ */
ctx->havePSK = 1; ctx->havePSK = 1;

8
src/ssl.c
View File

@@ -6900,12 +6900,14 @@ int wolfSSL_CTX_load_verify_locations_ex(WOLFSSL_CTX* ctx, const char* file,
flags & WOLFSSL_LOAD_FLAG_IGNORE_BAD_PATH_ERR) { flags & WOLFSSL_LOAD_FLAG_IGNORE_BAD_PATH_ERR) {
/* QSslSocket always loads certs in system folder /* QSslSocket always loads certs in system folder
* when it is initialized. * when it is initialized.
* Compliant with OpenSSL when flag sets.*/ * Compliant with OpenSSL when flag sets.
*/
ret = WOLFSSL_SUCCESS; ret = WOLFSSL_SUCCESS;
} }
else else {
/* qssl socket wants to know errors. */ /* qssl socket wants to know errors. */
WOLFSSL_ERROR(ret); WOLFSSL_ERROR(ret);
}
#endif #endif
} }
/* report failure if no files were loaded or there were failures */ /* report failure if no files were loaded or there were failures */
@@ -18834,7 +18836,7 @@ WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_set_peer_cert_chain(WOLFSSL* ssl)
if (sk == NULL) { if (sk == NULL) {
WOLFSSL_MSG("Null session chain"); WOLFSSL_MSG("Null session chain");
} }
#if defined(WOLFSSL_QT) #if defined(OPENSSL_ALL)
else if (ssl->options.side == WOLFSSL_SERVER_END) { else if (ssl->options.side == WOLFSSL_SERVER_END) {
/* to be compliant with openssl /* to be compliant with openssl
first element is kept as peer cert on server side.*/ first element is kept as peer cert on server side.*/