summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-12-10 14:21:59 +0000
committerMatt Caswell <matt@openssl.org>2015-12-10 14:21:59 +0000
commitac7f47dce13bf82d1279c0fe2affa07afbe81e06 (patch)
treef0b342a3417292f11d7f19d65fa77604e540a564
parentb0cae88cc22bf9e14510553b2cd663b701b02af7 (diff)
OpenSSL 1.1.0 is now in pre release
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--include/openssl/opensslv.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 4c4e7b4301..ab7b2af10d 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.2e and OpenSSL 1.1.0 [under development]
+ Major changes between OpenSSL 1.0.2e and OpenSSL 1.1.0 [in pre-release]
o Support for ChaCha20 and Poly1305 added to libcrypto and libssl
o Support for extended master secret
diff --git a/README b/README
index cc20f57d80..741d545e9d 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.1.0-dev
+ OpenSSL 1.1.0-pre1-dev (alpha)
Copyright (c) 1998-2015 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 5b6abdf800..c6c236443b 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -30,11 +30,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 0x10100000L
+# define OPENSSL_VERSION_NUMBER 0x10100001L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-fips-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-pre1-fips-dev (alpha) xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-pre1-dev (alpha) xx XXX xxxx"
# endif
/*-