Prepare for 1.0.1k release

Reviewed-by: Stephen Henson <steve@openssl.org>

diff --git a/CHANGES b/CHANGES
index 70fa3793f5a4b4f5c071b2224fccc83bc3c337f0..117ba6d79a59afa1734711e1aef4b4ddd9dc7c04 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.1j and 1.0.1k [xx XXX xxxx]
+ Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
 
   *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
      message can cause a segmentation fault in OpenSSL due to a NULL pointer

diff --git a/NEWS b/NEWS
index e036bc102ddc4f0f9819cf277e798e1d5ed5fd29..85969135ff17d6bf920f5ab580bca86e3d3cde09 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.
 
-  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [under development]
+  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015]
 
       o Fix for CVE-2014-3571
       o Fix for CVE-2015-0206

diff --git a/README b/README
index 734e1f8994ed1ff3acfcaecde38825c0f54506ff..df2734d3b5a4bae110b958d4108b180e09214a35 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1k-dev
+ OpenSSL 1.0.1k 8 Jan 2015
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index adba89b1ee0e8b4968c1a9ede2fb3d6955042c91..0aebfd44662650b2bbc42f9de4a43e11bd35db52 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -29,11 +29,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 0x100010b0L
+#define OPENSSL_VERSION_NUMBER 0x100010bfL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1k-fips-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1k-fips 8 Jan 2015"
 #else
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1k-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1k 8 Jan 2015"
 #endif
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT