Commit 98d0a2b

committed

umqtt.simple: Restore legacy ssl/ssl_params arguments.

Commit 35d41db changed the API for using SSL with umqtt, but only did a minor version increase. This broke various uses of this library, eg https://github.com/aws-samples/aws-iot-core-getting-started-micropython Reinstate the original API for specifying an SSL connection. This library now supports the following: - default, ssl=None or ssl=False: no SSL - ssl=True and optional ssl_params specified: use ssl.wrap_socket - ssl=<SSLContext instance>: use provided SSL context to wrap socket Signed-off-by: Damien George <damien@micropython.org>

1 parent 96e17b6 commit 98d0a2bCopy full SHA for 98d0a2b

File tree

2 files changed

+11

-2

lines changed

micropython/umqtt.simple
- manifest.py
- umqtt
  - simple.py

2 files changed

+11

-2

lines changed

`‎micropython/umqtt.simple/manifest.py‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`		`-metadata(description="Lightweight MQTT client for MicroPython.", version="1.5.0")`
	`1`	`+metadata(description="Lightweight MQTT client for MicroPython.", version="1.6.0")`
`2`	`2`
`3`	`3`	`# Originally written by Paul Sokolovsky.`
`4`	`4`
	`5`	`+require("ssl")`
	`6`	`+`
`5`	`7`	`package("umqtt")`

`‎micropython/umqtt.simple/umqtt/simple.py‎`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ def __init__(`
`17`	`17`	`password=None,`
`18`	`18`	`keepalive=0,`
`19`	`19`	`ssl=None,`
	`20`	`+ ssl_params={},`
`20`	`21`	`):`
`21`	`22`	`if port == 0:`
`22`	`23`	`port = 8883 if ssl else 1883`
`@@ -25,6 +26,7 @@ def __init__(`
`25`	`26`	`self.server = server`
`26`	`27`	`self.port = port`
`27`	`28`	`self.ssl = ssl`
	`29`	`+ self.ssl_params = ssl_params`
`28`	`30`	`self.pid = 0`
`29`	`31`	`self.cb = None`
`30`	`32`	`self.user = user`
`@@ -65,7 +67,12 @@ def connect(self, clean_session=True, timeout=None):`
`65`	`67`	`self.sock.settimeout(timeout)`
`66`	`68`	`addr = socket.getaddrinfo(self.server, self.port)[0][-1]`
`67`	`69`	`self.sock.connect(addr)`
`68`		`- if self.ssl:`
	`70`	`+ if self.ssl is True:`
	`71`	`+ # Legacy support for ssl=True and ssl_params arguments.`
	`72`	`+ import ssl`
	`73`	`+`
	`74`	`+ self.sock = ssl.wrap_socket(self.sock, **self.ssl_params)`
	`75`	`+ elif self.ssl:`
`69`	`76`	`self.sock = self.ssl.wrap_socket(self.sock, server_hostname=self.server)`
`70`	`77`	`premsg = bytearray(b"\x100円0円0円0円0円")`
`71`	`78`	`msg = bytearray(b"\x04MQTT\x04\x020円0円")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 98d0a2b

File tree

2 files changed

2 files changed

`‎micropython/umqtt.simple/manifest.py‎`

`‎micropython/umqtt.simple/umqtt/simple.py‎`

0 commit comments