Prepare for 1.1.0j release

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/CHANGES b/CHANGES
index cb2e6b10328d3222f4c72ce21fec88edd2dd8983..cf76704d15cd7a61165510362797207ef230f276 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
  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
 
 
   *) Timing vulnerability in DSA signature generation
 

diff --git a/NEWS b/NEWS
index 88a0be47d9a9652e213ff4ac787952f8c2b822fc..983fceb2bbe7e81d3cbd9e5e795db6101e203941 100644 (file)
--- 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.
 
   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)
 
       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 3af261971ea22085199b5eb0663f5abe38e2e981..46947019097071b1985e29f5bb34f57cf79e966a 100644 (file)
--- 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
 
  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 72f09af882a1bba11cf0acfde10134b346083b55..49f3c0a780a0cecaee49c96fd53bbabdeb11f34d 100644 (file)
--- 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)
  */
  * (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
 # 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
 # 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
 
 /*-
 # endif
 
 /*-