From: Matt Caswell <matt@openssl.org>
Date: Thu, 25 Mar 2021 13:28:38 +0000 (+0000)
Subject: Prepare for 1.1.1k release
X-Git-Tag: OpenSSL_1_1_1k^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd78df59b0f656aefe96e39533130454aa957c00;p=thirdparty%2Fopenssl.git

Prepare for 1.1.1k release

Reviewed-by: Tomas Mraz <tomas@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index 40fe5529bd1..7d0129e6876 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.1j and 1.1.1k [xx XXX xxxx]
+ Changes between 1.1.1j and 1.1.1k [25 Mar 2021]
 
   *) Fixed a problem with verifying a certificate chain when using the
      X509_V_FLAG_X509_STRICT flag. This flag enables additional security checks
diff --git a/NEWS b/NEWS
index a0a92cee939..05991a0c214 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.1j and OpenSSL 1.1.1k [under development]
+  Major changes between OpenSSL 1.1.1j and OpenSSL 1.1.1k [25 Mar 2021]
 
       o Fixed a problem with verifying a certificate chain when using the
         X509_V_FLAG_X509_STRICT flag (CVE-2021-3450)
diff --git a/README b/README
index 4f002256403..b92a8bd3a4b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1k-dev
+ OpenSSL 1.1.1k 25 Mar 2021
 
  Copyright (c) 1998-2021 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 bc775552714..0cd6b2f9485 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ 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  0x101010b0L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1k-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x101010bfL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1k  25 Mar 2021"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)