diff options
author | Jakub Witczak <kuba@erix.ericsson.se> | 2023-04-27 10:37:54 +0200 |
---|---|---|
committer | Jakub Witczak <kuba@erix.ericsson.se> | 2023-04-27 10:37:54 +0200 |
commit | 432aae16404da21d75ae85889e413d9843333d5e (patch) | |
tree | 23b59f5740ec7e2c61f1d95fea74d55d50a928fe /lib/crypto | |
parent | 726e31de4635c7ef7a52c42555d66a89fd74035a (diff) | |
parent | e0436a4fdd0994eddc353951b6c9f2f30bd8fb84 (diff) | |
download | erlang-432aae16404da21d75ae85889e413d9843333d5e.tar.gz |
Merge branch 'maint' into master
* maint:
Updated OTP version
Prepare release
Update copyright year
Diffstat (limited to 'lib/crypto')
-rw-r--r-- | lib/crypto/c_src/dh.c | 2 | ||||
-rw-r--r-- | lib/crypto/doc/src/notes.xml | 16 | ||||
-rw-r--r-- | lib/crypto/vsn.mk | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/lib/crypto/c_src/dh.c b/lib/crypto/c_src/dh.c index 92a339ab5f..15a08470a6 100644 --- a/lib/crypto/c_src/dh.c +++ b/lib/crypto/c_src/dh.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2010-2022. All Rights Reserved. + * Copyright Ericsson AB 2010-2023. 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/notes.xml b/lib/crypto/doc/src/notes.xml index 954d5cd664..fa5e9d5bea 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 5.1.4</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + With this change, random errors are fixed for + crypto:generate_key calls with OpenSSL 3.</p> + <p> + Own Id: OTP-18555</p> + </item> + </list> + </section> + +</section> + <section><title>Crypto 5.1.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk index 41dfbaef97..56f5a0f48e 100644 --- a/lib/crypto/vsn.mk +++ b/lib/crypto/vsn.mk @@ -1 +1 @@ -CRYPTO_VSN = 5.1.3 +CRYPTO_VSN = 5.1.4 |