summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-11-20 13:41:22 +0000
committerMatt Caswell <matt@openssl.org>2018-11-20 13:41:22 +0000
commit74f2d9c1ec5f5510e1d3da5a9f03c28df0977762 (patch)
tree9e9f1994d51afdf224b8911d56ee6ac4d4d157d5
parenta8e613cc51beaeb181a322da3620a27ef8bcead3 (diff)
Prepare for 1.1.0j releaseOpenSSL_1_1_0j
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--CHANGES2
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--include/openssl/opensslv.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index cb2e6b1032..cf76704d15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch.
- Changes between 1.1.0i and 1.1.0j [xx XXX xxxx]
+ Changes between 1.1.0i and 1.1.0j [20 Nov 2018]
*) Timing vulnerability in DSA signature generation
diff --git a/NEWS b/NEWS
index 88a0be47d9..983fceb2bb 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.1.0i and OpenSSL 1.1.0j [under development]
+ Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.0j [20 Nov 2018]
o Timing vulnerability in DSA signature generation (CVE-2018-0734)
o Timing vulnerability in ECDSA signature generation (CVE-2018-0735)
diff --git a/README b/README
index 3af261971e..4694701909 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.1.0j-dev
+ OpenSSL 1.1.0j 20 Nov 2018
Copyright (c) 1998-2018 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 72f09af882..49f3c0a780 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,11 +39,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 0x101000a0L
+# define OPENSSL_VERSION_NUMBER 0x101000afL
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j-fips-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j-fips 20 Nov 2018"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j 20 Nov 2018"
# endif
/*-