From: Matt Caswell Date: Wed, 15 Oct 2014 12:52:08 +0000 (+0100) Subject: Prepare for 1.0.0o release X-Git-Tag: OpenSSL_1_0_0o X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee5e0632a47d504b2bebb23e5e05419f3e8dec74;p=oweals%2Fopenssl.git Prepare for 1.0.0o release Reviewed-by: Stephen Henson --- diff --git a/CHANGES b/CHANGES index cc4e4cf77b..60792cb06a 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.0.0n and 1.0.0o [xx XXX xxxx] + Changes between 1.0.0n and 1.0.0o [15 Oct 2014] *) Session Ticket Memory Leak. diff --git a/NEWS b/NEWS index 6ed819421e..bdad21ca13 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.0n and OpenSSL 1.0.0o [under development] + Major changes between OpenSSL 1.0.0n and OpenSSL 1.0.0o [15 Oct 2014] o Fix for CVE-2014-3513 o Fix for CVE-2014-3567 diff --git a/README b/README index 32734c7e9b..36d7aa17b8 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.0o-dev + OpenSSL 1.0.0o 15 Oct 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 78e88b10e4..edad266c25 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 0x100000f0L +#define OPENSSL_VERSION_NUMBER 0x100000ffL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0o-fips-dev xx XXX xxxx" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0o-fips 15 Oct 2014" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0o-dev xx XXX xxxx" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0o 15 Oct 2014" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT