mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-11-27 20:59:00 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Integrate https://github.com/cesanta/mongoose/issues/1008

Browse Source 
PUBLISHED_FROM=1b7bf2d7318568851e6c8f07451cd3982d9498b6
This commit is contained in:
Sergey Lyubka 2019-06-13 08:37:06 +01:00 committed by Cesanta Bot
parent 3fc61a3edc
commit 2bdbfc27f6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mongoose.c
View File

@ -4968,7 +4968,7 @@ static enum mg_ssl_if_result mg_set_cipher_list(SSL_CTX *ctx, const char *cl) {
: MG_SSL_ERROR);
}
#ifndef KR_VERSION
#if !defined(KR_VERSION) && !defined(LIBRESSL_VERSION_NUMBER)
static unsigned int mg_ssl_if_ossl_psk_cb(SSL *ssl, const char *hint,
char *identity,
unsigned int max_identity_len,
@ -5034,10 +5034,10 @@ static enum mg_ssl_if_result mg_ssl_if_ossl_set_psk(struct mg_ssl_if_ctx *ctx,
(void) ctx;
(void) identity;
(void) key_str;
/* Krypton does not support PSK. */
/* Krypton / LibreSSL does not support PSK. */
return MG_SSL_ERROR;
}
#endif /* defined(KR_VERSION) */
#endif /* !defined(KR_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) */
const char *mg_set_ssl(struct mg_connection *nc, const char *cert,
const char *ca_cert) {

6
src/mg_ssl_if_openssl.c
View File

@ -310,7 +310,7 @@ static enum mg_ssl_if_result mg_set_cipher_list(SSL_CTX *ctx, const char *cl) {
: MG_SSL_ERROR);
}
#ifndef KR_VERSION
#if !defined(KR_VERSION) && !defined(LIBRESSL_VERSION_NUMBER)
static unsigned int mg_ssl_if_ossl_psk_cb(SSL *ssl, const char *hint,
char *identity,
unsigned int max_identity_len,
@ -376,10 +376,10 @@ static enum mg_ssl_if_result mg_ssl_if_ossl_set_psk(struct mg_ssl_if_ctx *ctx,
(void) ctx;
(void) identity;
(void) key_str;
/* Krypton does not support PSK. */
/* Krypton / LibreSSL does not support PSK. */
return MG_SSL_ERROR;
}
#endif /* defined(KR_VERSION) */
#endif /* !defined(KR_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) */
const char *mg_set_ssl(struct mg_connection *nc, const char *cert,
const char *ca_cert) {

2
test/Makefile
View File

@ -11,7 +11,7 @@ COMMON_DIR_DEV = ../../common
# Our dev repo and public mongoose repo have different layouts, so here
# we make it work on both
ifneq ("$(wildcard ../../fw)","")
ifneq ("$(wildcard ../../common.mk)","")
COMMON_PARENT = ../..
else
COMMON_PARENT = $(SRC_DIR)