320ddc1303
Merge branch 'master'
...
Conflicts:
CMakeLists.txt
ChangeLog.txt
client/Makefile
config.mk
installer/mosquitto.nsi
installer/mosquitto64.nsi
lib/mosquitto.h
lib/mqtt3_protocol.h
lib/util_mosq.c
set-version.sh
snap/snapcraft.yaml
src/bridge.c
src/database.c
src/handle_connack.c
src/loop.c
src/persist.c
test/broker/Makefile
7 years ago
110f4aada6
Don't overwrite disused client state.
7 years ago
cc153cfc90
Cleanup TLS UI method on exit.
7 years ago
2dd24449ad
Fix "unused parameter" warnings.
7 years ago
ce31269e05
Update changelog, bump version, bump copyright year.
7 years ago
988554e7f0
Fix openssl deprecated warnings.
7 years ago
a6f845bc67
Fix openssl deprecated function use.
7 years ago
d3d6f3a980
Fix compiling with openssl < 1.1.1.
7 years ago
479d8e5f1a
fix incorrect return code when connecting in non-blocking mode
...
Signed-off-by: krismattheus <kris.mattheus@visionbms.com>
7 years ago
1924afe49e
Add explicit support for TLS v1.3 and drop TLS v1.0.
7 years ago
5aabc171b0
Merge branch 'mqtt5' into develop
7 years ago
e862a047a8
Rework TLS engine support.
7 years ago
20894fcbce
Add engine private key password support
...
Some OpenSSL engines (selectable via tls_engine option) may require a
password to make use of private keys created with them in the first place.
The TPM engine for example, will require a password to access the underlying
TPM's Storage Root Key (SRK), which is the root key of a hierarchy of keys
associated with a TPM; it is generated within a TPM and is a non-migratable
key. Each owned TPM contains a SRK, generated by the TPM at the request
of the Owner. [1]
By default, the engine will prompt the user to introduce the SRK password
before any private keys created with the engine can be used. This could
be inconvenient when running on an unattended system.
Here's where the new tls_engine_kpass_sha option comes in handy. The user
can specify a SHA1 hash of its engine private key password via command
line or config file and it will be passed on to the engine directly.
This commit adds support for both clients (libmosquitto) and broker.
[1] https://goo.gl/qQoXBY
Signed-off-by: Nicolás Pernas Maradei <nicopernas@gmail.com>
7 years ago
f88cc06435
Add TLS engine and keyform support to libmosquitto
...
- Clients can now offload crypto tasks to an external crypto device through
the OpenSSL ENGINE API.
- The keyfiles can now be treated as PEM or ENGINE keys.
- Two new functions were added to libmosquitto to set up the previously
mentioned features.
- Both mosquitto_sub and mosquitto_pub include support to turn on the mentioned
features through command line options.
Signed-off-by: Nicolás Pernas Maradei <nicopernas@gmail.com>
7 years ago
084062c85e
Merge branch 'fixes' into mqtt5
7 years ago
7ff9c3763b
Fix socks build when using cmake.
7 years ago
f952ae3a67
Fixed durable clients being unable to receive messages when offline.
...
This occurred when per_listener_settings was set to true.
Closes #1081 . Thanks to dwin-wangjt.
7 years ago
4325c44baf
Don't clear SSL context when TLS connection is closed.
...
Previous behaviour would clear the external SSL_CTX provided by
MOSQ_OPT_SSL_CTX. This required the user to reset the SSL_CTX every
disconnect, and trust that they were not leaking references.
Recreating the SSL context for every connection is not necessary, and the
SSL context is freed in mosquitto_destroy, which is sufficient.
Signed-off-by: Matthias Stone <matthias@bellstone.ca>
7 years ago
e8320cbf19
Fix TLS connections not working over SOCKS.
...
Thanks to Mark Oeltjenbruns.
7 years ago
be9c1071b0
Fix compilation when openssl deprecated APIs are not available.
...
Closes #1094 . Thanks to Rosen Penev.
7 years ago
fcf4cd0b27
Merge branch 'master' into mqtt5
7 years ago
a00dd29af8
Fix building where TLS-PSK is not available.
...
Closes #68 .
7 years ago
e169f1c7c2
When using ADNS, don't ask for all network protocols when connecting.
...
This can lead to confusing "Protocol not supported" errors if the
network is down, because UDP sockets are provided.
Thanks to jsaak.
Closes #1062 .
Bug: https://github.com/eclipse/mosquitto/issues/1062
7 years ago
0a9ee5b4cf
Fix memory leak when reconnecting with TLS errors.
...
Fix memory leak that occurred if mosquitto_reconnect() was used when TLS
errors were present.
Closes #592 . Thanks to smartdabao and aaronovz1.
7 years ago
6c9e8d51c2
Merge branch 'develop' into mqtt5
7 years ago
0bacff11df
Rename mqtt3_protocol.h -> mqtt_protocol.h.
7 years ago
915e91d9be
Fix build with OPENSSL_NO_ENGINE
...
Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
7 years ago
0ec090f31a
Fixes for building on FreeBSD.
7 years ago
10b19a42ed
Fixes for building on NetBSD.
...
Closes #258 .
Thanks to Daniel Ölschlegel.
7 years ago
c757cb0912
Remove incorrect comment.
7 years ago
e185d18917
Better fix for #851 .
...
Ensure all sockets that are closed are set to INVALID_SOCKET.
Signed-off-by: Roger A. Light <roger@atchoo.org>
7 years ago
575dce91f0
Fix segfault on startup if bridge CA certificates could not be read.
...
Closes #851 .
Thanks to chelliwell.
Signed-off-by: Roger A. Light <roger@atchoo.org>
7 years ago
4bacbecb1b
Fix some places where return codes were incorrect.
...
Closes #850 .
Signed-off-by: Roger A. Light <roger@atchoo.org>
7 years ago
bcf76b9cb6
Remove use of AI_ADDRCONFIG.
...
Closes #869 , #901 .
Thanks to Alex Richman.
Signed-off-by: Roger A. Light <roger@atchoo.org>
7 years ago
286400abcf
Use AF_UNSPEC etc. instead of PF_UNSPEC to comply with POSIX.
...
Closes #863 .
Thanks to denigmus and Patrick TJ McPhee.
Signed-off-by: Roger A. Light <roger@atchoo.org>
7 years ago
e90a32835b
Merge branch 'fixes' into develop
8 years ago
6c7ecd7e97
Fix compiling without TLS.
8 years ago
ee610ab19a
_mosquitto_net_read must call WSASetLastError when changing errno so that the error code can be picked up by _mosquitto_packet_read
...
Signed-off-by: Thomas Beckmann (M-Way) <t.beckmann@mwaysolutions.com>
8 years ago
e961bc9301
Comment to aid init_ssl_ctx understanding.
8 years ago
b649799c78
Protect mosq->ssl_ctx against double initialisation.
8 years ago
943b311344
Don't use deprecated openssl functions.
8 years ago
24d68b5af8
Remove support for openssl 1.0.0 and 1.0.1.
...
These are no longer supported by openssl.
8 years ago
8470ca89b9
Add MOSQ_OPT_SSL_CTX and MOSQ_OPT_SSL_CTX_WITH_DEFAULTS options.
...
Closes #567 and #715 .
8 years ago
f4d238be18
Bump copyright years.
8 years ago
8e3c2d9af7
_mosquitto_net_read must call WSASetLastError when changing errno so that the error code can be picked up by _mosquitto_packet_read
...
Signed-off-by: Thomas Beckmann (M-Way) <t.beckmann@mwaysolutions.com>
8 years ago
e90afb8526
Adding tls host name extension (SNI)
...
Signed-off-by: Viktor Gotwig <viktor.gotwig@q-loud.de>
8 years ago
81cb7ab547
Merge branch 'fixes' into develop
8 years ago
7d8d04bc39
Fix issue when SSL_connect() returns SSL_ERROR_WANT_READ. A call to SSL_write here will later transmit a new client hello and make ssl connection fail.
...
Signed-off-by: JonoJensen <jono.jensen@yahoo.se>
8 years ago
b193918ca0
[649] Don't close socket again if nonblock fails.
...
Thanks to Edwin van den Oetelaar.
Bug: https://github.com/eclipse/mosquitto/issues/649
8 years ago
124ee1af91
[490] Further fix for auth related crashes.
...
Bug: https://github.com/eclipse/mosquitto/issues/490
8 years ago
22063013be
[490] Fix auth plugin+WS client+MOSQ_ERR_AUTH related crash.
...
Thanks to "hasunperera".
Bug: https://github.com/eclipse/mosquitto/issues/490
8 years ago
e74203de2c
Merge branch 'master' into develop
8 years ago
74adb43cc1
Adding OCSP Stapling support to mosquitto
...
Adding OCSP Stapling support to mosquitto, so that the TLS client side
requests the certificate status and checks it.
This code uses the OpenSSL-based OCSP implementation and is somewhat
based on the libcurl code for OCSP stapling.
Signed-off-by: Dr. Lars Voelker <lars.voelker@bmw.de>
8 years ago
621f18d696
#419 Broker sometimes kills connection to client
...
Signed-off-by: Jan Lukavsky <je.ik@seznam.cz>
8 years ago
b61fefcf08
Merge branch 'master' into develop
8 years ago
ab266e7f5f
lib: fix OpenSSL 1.1 deprecation warning for ERR_remove_state
...
ERR_remove_state has been marked deprecated in OpenSSL 1.1.0 and do
nothing, as the OpenSSL libraries now normally do all thread
initialization and deinitialisation automatically.
Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
9 years ago
91b308a11d
Merge branch 'master' into develop
9 years ago
ac981782db
Fix typo and use net__print_ssl_error() as available.
9 years ago
cd0985c3e2
Log more TLS error details
...
Signed-off-by: Jiří Pinkava <j-pi@seznam.cz>
9 years ago
433ee5c4d6
[344] Don't compile in async dns support by default for makefiles.
9 years ago
6f45ab9624
[344] Only do async dns on glibc.
9 years ago
5eae4b56d6
[344] More leak fixes.
9 years ago
e13af18ed9
Start of fix for [344].
9 years ago
98ea684906
[323] Allow outgoing IPv6 connections to use TLS.
...
Bug: https://github.com/eclipse/mosquitto/issues/323
9 years ago
f0485d1398
[344] Don't compile in async dns support by default for makefiles.
9 years ago
3d40ffe18b
[344] Only do async dns on glibc.
9 years ago
ee543a25f5
[344] More leak fixes.
9 years ago
ef7a230365
Start of fix for [344].
9 years ago
6f7a0bff4b
[323] Allow outgoing IPv6 connections to use TLS.
...
Bug: https://github.com/eclipse/mosquitto/issues/323
9 years ago
017db6706f
Rename mosquitto_broker.h -> mosquitto_broker_internal.h
9 years ago
8378fe44cf
Update copyrights.
9 years ago
1c3988a397
Merge branch 'master' into develop
9 years ago
e8185ddaa7
[166] Don't cancel external threads.
...
libmosquitto shouldn't cancel threads it didn't create. This change
allows us to keep track of whether threads were created by the library
or by external code.
Thanks to Josip Ćavar.
Bug: https://github.com/eclipse/mosquitto/issues/166
9 years ago
c6ef86bd1f
Print openssl errors when debugging enabled.
10 years ago
606aa5b4fa
Workaround for Windows SSL ( #160 )
...
Closes #154 .
Signed-off-by: Dmitry Kaukov <dkaukov@opentable.com>
10 years ago
af995d211d
Fix client library keepalive handling.
...
Fix the case where a message received just before the keepalive timer
expired would cause the client to miss the keepalive timer.
Thanks to Graham Benton.
10 years ago
d5abf5a18a
Outgoing connections can use any TLS version.
10 years ago
c7d4f4bcff
mosq->want_write should be cleared immediately before a call to SSL_write.
...
This allows clients using mosquitto_want_write() to get accurate results.
10 years ago
fca9ac84f7
Merge fixes into develop.
10 years ago
2549919413
Fix support for libwebsockets 1.22.
10 years ago
7aa653c42f
Add support for libwebsockets 1.6.
10 years ago
148df82144
[484693] Fix _mosquitto_socketpair() on Windows.
...
Thanks to Steve Woods and Roman Bogus.
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=484693
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479143
10 years ago
9a2eb2038f
Drop Windows XP support, misc fixes on Windows.
10 years ago
e2324ff9bb
Merge remote-tracking branch 'remotes/origin/master' into develop
...
Conflicts:
CMakeLists.txt
ChangeLog.txt
THANKS.txt
appveyor.yml
config.mk
installer/mosquitto-cygwin.nsi
installer/mosquitto.nsi
lib/messages_mosq.c
lib/messages_mosq.h
lib/mosquitto.c
lib/mosquitto.h
lib/net_mosq.c
lib/net_mosq.h
lib/send_client_mosq.c
lib/send_mosq.c
lib/socks_mosq.c
lib/will_mosq.c
src/bridge.c
src/conf.c
src/context.c
src/database.c
src/loop.c
src/mosquitto.c
src/mosquitto_broker.h
src/net.c
src/read_handle.c
src/read_handle_server.c
src/subs.c
10 years ago
290ea87828
Build fixes for OpenBSD.
11 years ago
4195fde70b
Last raft of renames for the moment.
11 years ago
21946ace6c
mosquitto__log_printf -> log__printf
11 years ago
b598aec385
Sys -> user includes.
11 years ago
970ba58da6
Code reorganise.
11 years ago
11756d24c8
Change internal funcs _foo_bar() to foo__bar().
11 years ago
dacee786be
[463000] Use own type to simplify socket handling.
...
Means that SOCKET is used as the socket type everywhere on Windows.
11 years ago
c9a924e95e
[462780] Fix crash on multiple calls to lib init/clean.
...
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=462780
11 years ago
35b729909c
[463241] Fix possible crash under heavy network load.
...
Thanks to Alexandre Zia.
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=463241
11 years ago
3ed5c94038
Struct optimisations.
11 years ago
39ffd6fa36
Handle "error" codes from SSL_connect() correctly.
11 years ago
8a18f577a6
Remove more unnecessary uses of calloc.
11 years ago
66f147749d
Fix missing mutex unlock.
11 years ago
36f88d902d
Fix errors from big code import.
11 years ago
ab49b96db1
Windows related fixes.
11 years ago
041f60c03e
Make bridge connections non-blocking for TLS connections.
11 years ago
Roger A. Light
krismattheus
Nicolás Pernas Maradei
Matthias Stone
Fredrik Fornwall
Thomas Beckmann (M-Way)
Viktor Gotwig
JonoJensen
Dr. Lars Voelker
Jan Lukavsky
Jelle van der Waa
Jiří Pinkava
Dmitry Kaukov