summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-12-08 13:25:31 +0000
committerMatt Caswell <matt@openssl.org>2020-12-08 13:25:31 +0000
commitfa174e280f15db2093c026a7e15433b5e5c65a76 (patch)
treee7a052b37c1d7d3d0538bd59e83921fb7b86bff3
parent61f86186e00aee7745f639962abb2c7ac762757d (diff)
downloadopenssl-new-fa174e280f15db2093c026a7e15433b5e5c65a76.tar.gz
Prepare for 1.0.2x releaseOpenSSL_1_0_2x
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--CHANGES2
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--crypto/opensslv.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index d30fadb7da..1e5b405423 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch.
- Changes between 1.0.2w and 1.0.2x [xx XXX xxxx]
+ Changes between 1.0.2w and 1.0.2x [8 Dec 2020]
*) Fixed NULL pointer deref in the GENERAL_NAME_cmp function
This function could crash if both GENERAL_NAMEs contain an EDIPARTYNAME.
diff --git a/NEWS b/NEWS
index bb35043a39..87ae5f293b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.
- Major changes between OpenSSL 1.0.2w and OpenSSL 1.0.2x [under development]
+ Major changes between OpenSSL 1.0.2w and OpenSSL 1.0.2x [8 Dec 2020]
o Fixed NULL pointer deref in GENERAL_NAME_cmp (CVE-2020-1971)
diff --git a/README b/README
index 99fa13b11f..c3ca6a1811 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.2x-dev
+ OpenSSL 1.0.2x 8 Dec 2020
Copyright (c) 1998-2020 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 6cd2670093..c20d522250 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-# define OPENSSL_VERSION_NUMBER 0x10002180L
+# define OPENSSL_VERSION_NUMBER 0x1000218fL
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2x-fips-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2x-fips 8 Dec 2020"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2x-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2x 8 Dec 2020"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT