Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix use of MOSQ_OPT_SSL_CTX when used with MOSQ_OPT_SSL_CTX_DEFAULTS
Closes #2463. Thanks to Tim Nordell.
- Loading branch information
Showing
7 changed files
with
138 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
test/lib/c/08-ssl-connect-cert-auth-custom-ssl-ctx-default.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
#include <errno.h> | ||
#include <stdbool.h> | ||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <mosquitto.h> | ||
#include <openssl/ssl.h> | ||
|
||
static int run = -1; | ||
|
||
void on_connect(struct mosquitto *mosq, void *obj, int rc) | ||
{ | ||
if(rc){ | ||
exit(1); | ||
}else{ | ||
mosquitto_disconnect(mosq); | ||
} | ||
} | ||
|
||
void on_disconnect(struct mosquitto *mosq, void *obj, int rc) | ||
{ | ||
run = rc; | ||
} | ||
|
||
int main(int argc, char *argv[]) | ||
{ | ||
int rc; | ||
struct mosquitto *mosq; | ||
SSL_CTX *ssl_ctx; | ||
int port = atoi(argv[1]); | ||
|
||
mosquitto_lib_init(); | ||
|
||
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | ||
| OPENSSL_INIT_ADD_ALL_DIGESTS \ | ||
| OPENSSL_INIT_LOAD_CONFIG, NULL); | ||
ssl_ctx = SSL_CTX_new(TLS_client_method()); | ||
This comment has been minimized.
Sorry, something went wrong. |
||
|
||
mosq = mosquitto_new("08-ssl-connect-crt-auth", true, NULL); | ||
if(mosq == NULL){ | ||
return 1; | ||
} | ||
|
||
mosquitto_int_option(mosq, MOSQ_OPT_SSL_CTX_WITH_DEFAULTS, 1); | ||
mosquitto_void_option(mosq, MOSQ_OPT_SSL_CTX, ssl_ctx); | ||
|
||
mosquitto_tls_set(mosq, "../ssl/test-root-ca.crt", "../ssl/certs", "../ssl/client.crt", "../ssl/client.key", NULL); | ||
mosquitto_connect_callback_set(mosq, on_connect); | ||
mosquitto_disconnect_callback_set(mosq, on_disconnect); | ||
|
||
rc = mosquitto_connect(mosq, "localhost", port, 60); | ||
|
||
while(run == -1){ | ||
mosquitto_loop(mosq, -1, 1); | ||
} | ||
mosquitto_destroy(mosq); | ||
|
||
mosquitto_lib_cleanup(); | ||
return run; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
#include <errno.h> | ||
#include <stdbool.h> | ||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <mosquitto.h> | ||
#include <openssl/ssl.h> | ||
|
||
static int run = -1; | ||
|
||
void on_connect(struct mosquitto *mosq, void *obj, int rc) | ||
{ | ||
if(rc){ | ||
exit(1); | ||
}else{ | ||
mosquitto_disconnect(mosq); | ||
} | ||
} | ||
|
||
void on_disconnect(struct mosquitto *mosq, void *obj, int rc) | ||
{ | ||
run = rc; | ||
} | ||
|
||
int main(int argc, char *argv[]) | ||
{ | ||
int rc; | ||
struct mosquitto *mosq; | ||
SSL_CTX *ssl_ctx; | ||
int port = atoi(argv[1]); | ||
|
||
mosquitto_lib_init(); | ||
|
||
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | ||
| OPENSSL_INIT_ADD_ALL_DIGESTS \ | ||
| OPENSSL_INIT_LOAD_CONFIG, NULL); | ||
ssl_ctx = SSL_CTX_new(TLS_client_method()); | ||
This comment has been minimized.
Sorry, something went wrong. |
||
|
||
SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); | ||
SSL_CTX_use_certificate_chain_file(ssl_ctx, "../ssl/client.crt"); | ||
SSL_CTX_use_PrivateKey_file(ssl_ctx, "../ssl/client.key", SSL_FILETYPE_PEM); | ||
SSL_CTX_load_verify_locations(ssl_ctx, "../ssl/test-root-ca.crt", "../ssl/certs"); | ||
|
||
mosq = mosquitto_new("08-ssl-connect-crt-auth", true, NULL); | ||
if(mosq == NULL){ | ||
return 1; | ||
} | ||
mosquitto_tls_set(mosq, "../ssl/test-root-ca.crt", "../ssl/certs", "../ssl/client.crt", "../ssl/client.key", NULL); | ||
mosquitto_connect_callback_set(mosq, on_connect); | ||
mosquitto_disconnect_callback_set(mosq, on_disconnect); | ||
|
||
mosquitto_int_option(mosq, MOSQ_OPT_SSL_CTX_WITH_DEFAULTS, 0); | ||
mosquitto_void_option(mosq, MOSQ_OPT_SSL_CTX, ssl_ctx); | ||
|
||
rc = mosquitto_connect(mosq, "localhost", port, 60); | ||
|
||
while(run == -1){ | ||
mosquitto_loop(mosq, -1, 1); | ||
} | ||
mosquitto_destroy(mosq); | ||
|
||
mosquitto_lib_cleanup(); | ||
return run; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Missing matching
SSL_CTX_free(...)
.