Merge branch 'maint' into master

* maint:
  Updated OTP version
  Prepare release
  Update copyright year

5 files changed, 81 insertions, 4 deletions

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 1a1e83cef7..ec5cb32973 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2021. All Rights Reserved.
+# Copyright Ericsson AB 1999-2022. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 84cd64e0b8..ededb1cef1 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -3,7 +3,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2021</year>
+      <year>1999</year><year>2022</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/doc/src/crypto_app.xml b/lib/crypto/doc/src/crypto_app.xml
index a823000a64..84fad2f5b8 100644
--- a/lib/crypto/doc/src/crypto_app.xml
+++ b/lib/crypto/doc/src/crypto_app.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1999</year>
-      <year>2021</year>
+      <year>2022</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index e503129511..3d73ee3a76 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,83 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 5.0.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The crypto app in OTP can since OTP-24.2 be compiled,
+	    linked and used with the new OpenSSL 3.0 cryptolib.</p>
+          <p>
+	    The crypto app has 3.0 support has been improved, but is
+	    still <em>*not recommended*</em> for other usages than
+	    experiments and alpha testing. There are not yet any
+	    guaranties that it works, not even together with other
+	    OTP applications like for example SSL and SSH, although
+	    there are no known errors.</p>
+          <p>
+	    Since the previous release, OTP-24.2, the following
+	    improvements have been done:</p>
+          <p>
+	    - It has been tested during nearly every nightly test on
+	    the OTP lab</p>
+          <p>
+	    - The hash algorithms <c>md4</c> and <c>ripemd160</c>
+	    have been enabled with OpenSSL 3.0.</p>
+          <p>
+	    - The ciphers <c>blowfish_cbc</c>, <c>blowfish_ecb</c>,
+	    <c>des_cbc</c>, <c>des_cfb</c>, <c>des_ecb</c>,
+	    <c>rc2_cbc</c> and <c>rc4</c> have been enabled with
+	    OpenSSL 3.0.</p>
+          <p>
+	    Disabled or unsupported with OpenSSL 3.0 are still:</p>
+          <p>
+	    - ENGINE support</p>
+          <p>
+	    - FIPS mode</p>
+          <p>
+	    - Other providers than the built-in ones</p>
+          <p>
+	    - Compiling and linking with OpenSSL 3.0 cryptolib in
+	    compatibility modes (for example to behave as 1.1.1) </p>
+          <p>
+	    and, the ciphers <c>blowfish_cfb64</c> and
+	    <c>blowfish_ofb64</c> are not supported and will not be
+	    either.</p>
+          <p>
+	    Deprecated functions in the OpenSSL 3.0 cryptolib must
+	    not be disabled as OTP/crypto still uses some of the
+	    deprecated API functions. The gcc flag
+	    <c>-Wno-deprecated-declarations</c> is set to prevent
+	    deprecation warnings to be printed when compiling.</p>
+          <p>
+	    Own Id: OTP-17812 Aux Id: OTP-16646, OTP-16282 </p>
+        </item>
+        <item>
+          <p>
+	    Crypto is adapted to LibreSSL 3.5.0 on OpenBSD.</p>
+          <p>
+	    Own Id: OTP-17941 Aux Id: OTP-17942 </p>
+        </item>
+        <item>
+          <p>
+	    New configure option ( <c>--disable-otp-test-engine</c>)
+	    to prohibit the build of the OTP test engine used in some
+	    test suites.</p>
+          <p>
+	    The reason is that the test engine could be hard to
+	    compile on for instance LibreSSL 3.5.0. For that
+	    particular cryptolib version (or higher), this configure
+	    option is set automatically.</p>
+          <p>
+	    Own Id: OTP-17942 Aux Id: OTP-17941 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 5.0.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 3379d020be..9e3356b8c2 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.0.5
+CRYPTO_VSN = 5.0.6