Skip to content

Commit 06ac1a1

Browse files
committed
upgrades MbedTLS bundle to v3.5.2
1 parent cb3d97c commit 06ac1a1

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: nanonext
22
Type: Package
33
Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
4-
Version: 0.12.0.9020
4+
Version: 0.12.0.9021
55
Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
66
a socket library implementing 'Scalability Protocols', a reliable,
77
high-performance standard for common communications patterns including

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nanonext 0.12.0.9020 (development)
1+
# nanonext 0.12.0.9021 (development)
22

33
*Please note this version contains breaking behavioural changes - see updates below.*
44

@@ -11,6 +11,7 @@
1111
* `messenger()` specifying 'auth' now works reliably on endpoints using different R versions/platforms due to the above hashing portability fix.
1212
* `sha1()` is removed as a hash option.
1313
* Internal memory-efficiency and performance enhancements.
14+
* Upgrades bundled 'libmbedtls' to v3.5.2.
1415

1516
# nanonext 0.12.0
1617

README.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ vignette("nanonext", package = "nanonext")
146146

147147
#### Linux / Mac / Solaris
148148

149-
Installation from source requires 'libnng' >= v1.5.0 and 'libmbedtls' >= 2.5.0 (suitable installations are automatically detected), or else 'cmake' to compile 'libnng' v1.7.0 and 'libmbedtls' v3.5.1 included within the package sources.
149+
Installation from source requires 'libnng' >= v1.5.0 and 'libmbedtls' >= 2.5.0 (suitable installations are automatically detected), or else 'cmake' to compile 'libnng' v1.7.0 and 'libmbedtls' v3.5.2 included within the package sources.
150150

151151
**It is recommended for optimal performance and stability to let the package automatically compile bundled versions of 'libmbedtls' and 'libnng' during installation.** To ensure the libraries are compiled from source even if system installations are present, set the `NANONEXT_LIBS` environment variable prior to installation e.g. by `Sys.setenv(NANONEXT_LIBS = 1)`.
152152

@@ -156,7 +156,7 @@ As system libraries, 'libnng' is available as libnng-dev (deb) or nng-devel (rpm
156156

157157
#### Windows
158158

159-
For R >= 4.2 using the 'Rtools42' or 'Rtools43' toolchains, 'libnng' v1.7.0 and 'libmbedtls' v3.5.1 will be automatically compiled from the package sources during installation.
159+
For R >= 4.2 using the 'Rtools42' or 'Rtools43' toolchains, 'libnng' v1.7.0 and 'libmbedtls' v3.5.2 will be automatically compiled from the package sources during installation.
160160

161161
For previous R versions, pre-compiled 'libnng' v1.7.0 and 'libmbedtls' v3.5.1 libraries are downloaded and used for installation instead.
162162

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ vignette("nanonext", package = "nanonext")
178178

179179
Installation from source requires ‘libnng’ \>= v1.5.0 and ‘libmbedtls’
180180
\>= 2.5.0 (suitable installations are automatically detected), or else
181-
‘cmake’ to compile ‘libnng’ v1.7.0 and ‘libmbedtls’ v3.5.1 included
181+
‘cmake’ to compile ‘libnng’ v1.7.0 and ‘libmbedtls’ v3.5.2 included
182182
within the package sources.
183183

184184
**It is recommended for optimal performance and stability to let the
@@ -202,7 +202,7 @@ OpenCSW - refer to the ‘cmake’ website for the latest source file.*
202202
#### Windows
203203

204204
For R \>= 4.2 using the ‘Rtools42’ or ‘Rtools43’ toolchains, ‘libnng’
205-
v1.7.0 and ‘libmbedtls’ v3.5.1 will be automatically compiled from the
205+
v1.7.0 and ‘libmbedtls’ v3.5.2 will be automatically compiled from the
206206
package sources during installation.
207207

208208
For previous R versions, pre-compiled ‘libnng’ v1.7.0 and ‘libmbedtls’

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Library versions
44
LIB_VER="f338f50"
5-
TLS_VER="edb8fec"
5+
TLS_VER="daca7a3"
66

77
# Initialise
88
PKG_CFLAGS=""

configure.ucrt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Library versions
22
LIB_VER="f338f50"
3-
TLS_VER="edb8fec"
3+
TLS_VER="daca7a3"
44

55
tar -xf src/mbedtls-$TLS_VER.tar.xz
66
cd mbedtls-$TLS_VER

src/mbedtls-daca7a3.tar.xz

387 KB
Binary file not shown.

src/mbedtls-edb8fec.tar.xz

-386 KB
Binary file not shown.

vignettes/nanonext.Rmd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ call_aio(aio)
206206
aio
207207
#> < recvAio | $data >
208208
aio$data |> str()
209-
#> num [1:100000000] -0.5243 0.51409 -0.16473 -0.00198 1.14541 ...
209+
#> num [1:100000000] 0.573 -0.5153 -0.1211 0.4534 -0.0155 ...
210210
```
211211

212212
As `call_aio()` is blocking and will wait for completion, an alternative is to query `aio$data` directly. This will return an 'unresolved' logical NA value if the calculation is yet to complete.
@@ -325,7 +325,7 @@ Additionally, the convenience function `write_cert()` can automatically generate
325325
cert <- write_cert(cn = "127.0.0.1")
326326
str(cert)
327327
#> List of 2
328-
#> $ server: chr [1:2] "-----BEGIN CERTIFICATE-----\nMIIFOTCCAyGgAwIBAgIBATANBgkqhkiG9w0BAQsFADA0MRIwEAYDVQQDDAkxMjcu\nMC4wLjExETAPBgNV"| __truncated__ "-----BEGIN RSA PRIVATE KEY-----\nMIIJJwIBAAKCAgEAqiykSGOArCCKt6JSMcXs9nBrBau+pSMAa0lo8xFZgnep6GeN\nvHol6RM5Ud4R"| __truncated__
328+
#> $ server: chr [1:2] "-----BEGIN CERTIFICATE-----\nMIIFOTCCAyGgAwIBAgIBATANBgkqhkiG9w0BAQsFADA0MRIwEAYDVQQDDAkxMjcu\nMC4wLjExETAPBgNV"| __truncated__ "-----BEGIN RSA PRIVATE KEY-----\nMIIJJwIBAAKCAgEAvECf4NSpbJ4BqW1ByzWuuIl/Z5qj2UHOAPXN1cV50PaopKxz\nWIrSWvZcaGcA"| __truncated__
329329
#> $ client: chr [1:2] "-----BEGIN CERTIFICATE-----\nMIIFOTCCAyGgAwIBAgIBATANBgkqhkiG9w0BAQsFADA0MRIwEAYDVQQDDAkxMjcu\nMC4wLjExETAPBgNV"| __truncated__ ""
330330

331331
ser <- tls_config(server = cert$server)
@@ -483,7 +483,7 @@ ncurl("https://postman-echo.com/get")
483483
#> NULL
484484
#>
485485
#> $data
486-
#> [1] "{\n \"args\": {},\n \"headers\": {\n \"x-forwarded-proto\": \"https\",\n \"x-forwarded-port\": \"443\",\n \"host\": \"postman-echo.com\",\n \"x-amzn-trace-id\": \"Root=1-65afeffb-1de811376ef8869c16f2153b\"\n },\n \"url\": \"https://postman-echo.com/get\"\n}"
486+
#> [1] "{\n \"args\": {},\n \"headers\": {\n \"x-forwarded-proto\": \"https\",\n \"x-forwarded-port\": \"443\",\n \"host\": \"postman-echo.com\",\n \"x-amzn-trace-id\": \"Root=1-65c20eef-6c82227031fc2c373c58020f\"\n },\n \"url\": \"https://postman-echo.com/get\"\n}"
487487
```
488488

489489
For advanced use, supports additional HTTP methods such as POST or PUT.
@@ -500,10 +500,10 @@ res
500500

501501
call_aio(res)$headers
502502
#> $date
503-
#> [1] "Tue, 23 Jan 2024 16:57:32 GMT"
503+
#> [1] "Tue, 06 Feb 2024 10:50:23 GMT"
504504

505505
res$data
506-
#> [1] "{\n \"args\": {},\n \"data\": {\n \"key\": \"value\"\n },\n \"files\": {},\n \"form\": {},\n \"headers\": {\n \"x-forwarded-proto\": \"https\",\n \"x-forwarded-port\": \"443\",\n \"host\": \"postman-echo.com\",\n \"x-amzn-trace-id\": \"Root=1-65afeffc-7cf3a99e264cdec9562e297e\",\n \"content-length\": \"16\",\n \"content-type\": \"application/json\",\n \"authorization\": \"Bearer APIKEY\"\n },\n \"json\": {\n \"key\": \"value\"\n },\n \"url\": \"https://postman-echo.com/post\"\n}"
506+
#> [1] "{\n \"args\": {},\n \"data\": {\n \"key\": \"value\"\n },\n \"files\": {},\n \"form\": {},\n \"headers\": {\n \"x-forwarded-proto\": \"https\",\n \"x-forwarded-port\": \"443\",\n \"host\": \"postman-echo.com\",\n \"x-amzn-trace-id\": \"Root=1-65c20eef-55bdad761cdda3023d8443d9\",\n \"content-length\": \"16\",\n \"content-type\": \"application/json\",\n \"authorization\": \"Bearer APIKEY\"\n },\n \"json\": {\n \"key\": \"value\"\n },\n \"url\": \"https://postman-echo.com/post\"\n}"
507507
```
508508

509509
In this respect, it may be used as a performant and lightweight method for making REST API requests.
@@ -527,7 +527,7 @@ transact(sess)
527527
#>
528528
#> $headers
529529
#> $headers$Date
530-
#> [1] "Tue, 23 Jan 2024 16:57:32 GMT"
530+
#> [1] "Tue, 06 Feb 2024 10:50:24 GMT"
531531
#>
532532
#> $headers$`Content-Type`
533533
#> [1] "application/json; charset=utf-8"
@@ -538,7 +538,7 @@ transact(sess)
538538
#> [41] 72 77 61 72 64 65 64 2d 70 72 6f 74 6f 22 3a 20 22 68 74 74 70 73 22 2c 0a 20 20 20 20 22 78 2d 66 6f 72 77 61 72 64 65
539539
#> [81] 64 2d 70 6f 72 74 22 3a 20 22 34 34 33 22 2c 0a 20 20 20 20 22 68 6f 73 74 22 3a 20 22 70 6f 73 74 6d 61 6e 2d 65 63 68
540540
#> [121] 6f 2e 63 6f 6d 22 2c 0a 20 20 20 20 22 78 2d 61 6d 7a 6e 2d 74 72 61 63 65 2d 69 64 22 3a 20 22 52 6f 6f 74 3d 31 2d 36
541-
#> [161] 35 61 66 65 66 66 63 2d 36 66 37 66 31 33 30 31 31 39 30 62 39 38 36 36 31 62 66 66 31 64 65 34 22 2c 0a 20 20 20 20 22
541+
#> [161] 35 63 32 30 65 66 30 2d 32 31 36 35 35 63 39 32 36 61 62 31 34 39 64 39 35 32 39 33 66 36 34 66 22 2c 0a 20 20 20 20 22
542542
#> [201] 63 6f 6e 74 65 6e 74 2d 74 79 70 65 22 3a 20 22 61 70 70 6c 69 63 61 74 69 6f 6e 2f 6a 73 6f 6e 22 2c 0a 20 20 20 20 22
543543
#> [241] 61 75 74 68 6f 72 69 7a 61 74 69 6f 6e 22 3a 20 22 42 65 61 72 65 72 20 41 50 49 4b 45 59 22 0a 20 20 7d 2c 0a 20 20 22
544544
#> [281] 75 72 6c 22 3a 20 22 68 74 74 70 73 3a 2f 2f 70 6f 73 74 6d 61 6e 2d 65 63 68 6f 2e 63 6f 6d 2f 67 65 74 22 0a 7d

0 commit comments

Comments
 (0)