From 11d31c00adca551fc853da36f98e078d83f8a680 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 6 Jan 2014 15:02:46 +0000 Subject: [PATCH] Prepare for 1.0.0m-dev --- CHANGES | 4 ++++ NEWS | 4 ++++ README | 2 +- crypto/opensslv.h | 6 +++--- openssl.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index bf9b3d0f8a..4bf93e1998 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.0.0l and 1.0.0m [xx XXX xxxx] + + *) + Changes between 1.0.0k and 1.0.0l [6 Jan 2014] *) Keep original DTLS digest and encryption contexts in retransmission diff --git a/NEWS b/NEWS index 363bab4c03..e04479c1ff 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,10 @@ 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.0l and OpenSSL 1.0.0m [under development] + + o + Major changes between OpenSSL 1.0.0k and OpenSSL 1.0.0l [6 Jan 2014] o Fix for DTLS retransmission bug CVE-2013-6450 diff --git a/README b/README index c94fc23a34..25559b82b7 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.0l 6 Jan 2014 + OpenSSL 1.0.0m-dev 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 fe5ae67b24..3118785cbd 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 0x100000cfL +#define OPENSSL_VERSION_NUMBER 0x100000d0L #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0l-fips 6 Jan 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m-fips-dev xx XXX xxxx" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0l 6 Jan 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m-dev xx XXX xxxx" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/openssl.spec b/openssl.spec index cd65a8b98c..d5e1e4a3a0 100644 --- a/openssl.spec +++ b/openssl.spec @@ -6,7 +6,7 @@ Release: 1 Summary: Secure Sockets Layer and cryptography libraries and tools Name: openssl -Version: 1.0.0l +Version: 1.0.0m Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries -- 2.25.1