From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 6 Jan 2014 14:36:07 +0000 (+0000)
Subject: Prepare for 1.0.1f release
X-Git-Tag: OpenSSL_1_0_1f^0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d8776344cd7965fadd870e361503985df9c45bb;p=oweals%2Fopenssl.git

Prepare for 1.0.1f release
---

diff --git a/CHANGES b/CHANGES
index 6494184bad..9302f586a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.1e and 1.0.1f [xx XXX xxxx]
+ Changes between 1.0.1e and 1.0.1f [6 Jan 2014]
 
   *) Fix for TLS record tampering bug. A carefully crafted invalid 
      handshake could crash OpenSSL with a NULL pointer exception.
diff --git a/NEWS b/NEWS
index 81b6ed2c7b..909fea96cf 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.1e and OpenSSL 1.0.1f [under development]
+  Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [6 Jan 2014]
 
       o Fix for TLS record tampering bug CVE-2013-4353
       o Fix for TLS version checking bug CVE-2013-6449
diff --git a/README b/README
index ac0c464023..05b670c5d9 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1f-dev
+ OpenSSL 1.0.1f 6 Jan 2014
 
  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 ef8ff97297..b27a5bb8c0 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x10001060L
+#define OPENSSL_VERSION_NUMBER	0x1000106fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1f-fips-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1f-fips 6 Jan 2014"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1f-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1f 6 Jan 2014"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT