summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-08 14:03:40 +0000
committerMatt Caswell <matt@openssl.org>2015-01-08 14:03:40 +0000
commitb4a57c4c419a578d1a16862a6b445c34003b4c52 (patch)
tree0051e14b3941feb3501e483f5797fdd88c5b2a82
parentfaa8038edde3fa0c99e3d1eeb3a6372e51a2371c (diff)
Prepare for 1.0.1k releaseOpenSSL_1_0_1k
Reviewed-by: Stephen Henson <steve@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 70fa3793f5..117ba6d79a 100644
--- 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 e036bc102d..85969135ff 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.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 734e1f8994..df2734d3b5 100644
--- 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 adba89b1ee..0aebfd4466 100644
--- 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