summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--erts/doc/src/notes.xml28
-rw-r--r--erts/vsn.mk2
-rw-r--r--lib/crypto/doc/src/notes.xml20
-rw-r--r--lib/crypto/vsn.mk2
-rw-r--r--lib/mnesia/doc/src/notes.xml19
-rw-r--r--lib/mnesia/vsn.mk2
-rw-r--r--lib/ssh/doc/src/notes.xml16
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--lib/ssl/doc/src/notes.xml56
-rw-r--r--lib/ssl/vsn.mk2
-rw-r--r--make/otp_version_tickets28
11 files changed, 153 insertions, 24 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 8363f2b647..d63ecb8ead 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,34 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 12.3.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Accept funs (NEW_FUN_EXT) with incorrectly encoded size
+ field. This is a workaround for a bug (OTP-18104)
+ existing in OTP 23 and 24 that could cause incorrect size
+ fields in certain cases. The emulator does not use the
+ decoded size field, but <c>erl_interface</c> still does
+ and is not helped by this workaround.</p>
+ <p>
+ Own Id: OTP-18093 Aux Id: OTP-18104, PR-5987 </p>
+ </item>
+ <item>
+ <p>
+ The zlib built in to the runtime system has been updated
+ to version 1.2.12. (Note that on most platforms, the
+ platform's own zlib is used.)</p>
+ <p>
+ Own Id: OTP-18123 Aux Id: GH-5994 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 12.3.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index a6515440d4..03e58e80b7 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 12.3.2
+VSN = 12.3.2.1
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 3d73ee3a76..eeceabd059 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,26 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
+<section><title>Crypto 5.0.6.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>Fix timing bug in ensure_engine_loaded</p> <p>When two
+ ensure_engine_loaded() calls were done in parallel there
+ was a possibility that a crypto lib function was called
+ by both instead of just one of them which resulted in an
+ error. This is solved by moving the implementation from
+ erlang down into a NIF function that uses a mutex to
+ protect the sensitive part.</p>
+ <p>
+ Own Id: OTP-17858 Aux Id: ERIERL-728 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Crypto 5.0.6</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 9e3356b8c2..d4a40d4b99 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.0.6
+CRYPTO_VSN = 5.0.6.1
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 0ce4a959ed..0f6d9e8756 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,24 @@
thus constitutes one section in this document. The title of each
section is the version number of Mnesia.</p>
- <section><title>Mnesia 4.20.4</title>
+ <section><title>Mnesia 4.20.4.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed <c>add_table_copy</c> which could leave a table
+ lock if the receiving node went down during the
+ operation.</p>
+ <p>
+ Own Id: OTP-18128 Aux Id: PR-6013 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Mnesia 4.20.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 8f04eb60fe..44d5e50d71 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.20.4
+MNESIA_VSN = 4.20.4.1
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 54904de950..eec7992892 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,22 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.13.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Binaries can be limited in logs with the parameter
+ <c>max_log_item_len</c>. The default value is 500 bytes.</p>
+ <p>
+ Own Id: OTP-18094</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.13.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 3a88e96f93..afc1b15148 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.13.2
+SSH_VSN = 4.13.2.1
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 564eb9ec9c..e744f46545 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,62 @@
</header>
<p>This document describes the changes made to the SSL application.</p>
+<section><title>SSL 10.7.3.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ When a TLS-1.3 enabled client tried to talk to a TLS-1.2
+ server that coalesces TLS-1.2 handshake message over one
+ TLS record, the connection could fail due to some message
+ being handled in the wrong state, this has been fixed.</p>
+ <p>
+ Own Id: OTP-18087 Aux Id: GH-5961 </p>
+ </item>
+ <item>
+ <p>
+ Fixed tls-1.3 session ticket lifetime which was discarded
+ to quickly before.</p>
+ <p>
+ Own Id: OTP-18092 Aux Id: PR-5959 </p>
+ </item>
+ <item>
+ <p>
+ Correctly handles supported protocol version change from
+ default to something else by sni_fun supplied to
+ ssl:handshake/[2,3] together with a TCP-socket (so called
+ upgrade).</p>
+ <p>
+ Own Id: OTP-18100 Aux Id: GH-5985 </p>
+ </item>
+ <item>
+ <p>
+ Also, TLS-1.3 should respond with a protocol version
+ alert if previous versions, that are supported but not
+ configured, are attempted.</p>
+ <p>
+ Own Id: OTP-18129 Aux Id: GH-5950 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Enhance handling of handshake decoding errors, especially
+ for certificate authorities extension to ensure graceful
+ termination.</p>
+ <p>
+ Own Id: OTP-18085</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SSL 10.7.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index bdc7ce4739..e19d9e50fa 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.7.3
+SSL_VSN = 10.7.3.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 69c9db2245..52ea89009a 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,18 +1,10 @@
-OTP-17970
-OTP-18027
-OTP-18028
-OTP-18056
-OTP-18061
-OTP-18062
-OTP-18064
-OTP-18065
-OTP-18066
-OTP-18069
-OTP-18071
-OTP-18075
-OTP-18076
-OTP-18077
-OTP-18078
-OTP-18080
-OTP-18081
-OTP-18082
+OTP-17858
+OTP-18085
+OTP-18087
+OTP-18092
+OTP-18093
+OTP-18094
+OTP-18100
+OTP-18123
+OTP-18128
+OTP-18129