aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorHenrik <[email protected]>2018-03-14 09:58:15 +0100
committerHenrik <[email protected]>2018-03-14 09:58:15 +0100
commit388b24ea7327ce8c7267b48c3a464ce8c404ddd6 (patch)
treee2d32963f888c4f358e7b020db65a3d591e360ed /lib/crypto
parentc5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (diff)
parenta113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff)
downloadotp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.gz
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.bz2
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/doc/src/notes.xml16
-rw-r--r--lib/crypto/vsn.mk2
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index dbeb886d7b..1f788a4e35 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,22 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
+<section><title>Crypto 4.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix build error caused by removed RSA padding functions
+ in LibreSSL >= 2.6.1</p>
+ <p>
+ Own Id: OTP-14873</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Crypto 4.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index da3915a4fc..3432f00836 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.2
+CRYPTO_VSN = 4.2.1