summaryrefslogtreecommitdiff
path: root/lib/crypto
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2021-10-05 08:29:33 +0200
committerIngela Anderton Andin <ingela@erlang.org>2021-10-05 08:29:33 +0200
commit05b2ef94b66d168ea524f0e07e406573e80742a7 (patch)
tree2409fc73bda0c305b0dd3358b602a9fa4005e468 /lib/crypto
parent6c2b3c7c679a0ba2c04b1a6c34ee9bb166c9c7a8 (diff)
parent0706178dea1c62d8d63c33c86bbf473dcaef89d5 (diff)
downloaderlang-05b2ef94b66d168ea524f0e07e406573e80742a7.tar.gz
Merge branch 'maint-24' into maint
* maint-24: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/doc/src/notes.xml22
-rw-r--r--lib/crypto/vsn.mk2
2 files changed, 23 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 3201019419..ee9c940421 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,28 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
+<section><title>Crypto 5.0.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed minor memory leak at <c>crypto</c> module purge.</p>
+ <p>
+ Own Id: OTP-17668 Aux Id: PR-5245 </p>
+ </item>
+ <item>
+ <p>
+ Fix possible inconsistency in fips mode when linking with
+ some cryptolibs.</p>
+ <p>
+ Own Id: OTP-17672</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Crypto 5.0.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index d0459ce924..806bd620b5 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.0.3
+CRYPTO_VSN = 5.0.4