[openssl-commits] [openssl] OpenSSL_1_0_0-stable update
Matt Caswell
matt at openssl.org
Thu Jan 15 15:30:21 UTC 2015
The branch OpenSSL_1_0_0-stable has been updated
via 569c68744ab18ff48074a683a57962d959fcb13c (commit)
via cdac2e8928ca483843bfa3b527efb16e7f83bd60 (commit)
via 01fb34ad43660a96ee19d9be663f970dc4fd9b9f (commit)
from 08fac3fb6f17915cd28d1f25d4eaac97e09e9cb2 (commit)
- Log -----------------------------------------------------------------
commit 569c68744ab18ff48074a683a57962d959fcb13c
Author: Matt Caswell <matt at openssl.org>
Date: Thu Jan 15 15:01:09 2015 +0000
Prepare for 1.0.0r-dev
Reviewed-by: Stephen Henson <steve at openssl.org>
commit cdac2e8928ca483843bfa3b527efb16e7f83bd60
Author: Matt Caswell <matt at openssl.org>
Date: Thu Jan 15 14:56:27 2015 +0000
Prepare for 1.0.0q release
Reviewed-by: Stephen Henson <steve at openssl.org>
commit 01fb34ad43660a96ee19d9be663f970dc4fd9b9f
Author: Matt Caswell <matt at openssl.org>
Date: Thu Jan 15 14:56:27 2015 +0000
make update
Reviewed-by: Stephen Henson <steve at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 6 +++++-
NEWS | 6 +++++-
README | 2 +-
crypto/ecdsa/Makefile | 13 ++++++-------
crypto/opensslv.h | 6 +++---
openssl.spec | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/CHANGES b/CHANGES
index ff739a4..f48a002 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
OpenSSL CHANGES
_______________
- Changes between 1.0.0p and 1.0.0q [xx XXX xxxx]
+ Changes between 1.0.0q and 1.0.0r [xx XXX xxxx]
+
+ *)
+
+ Changes between 1.0.0p and 1.0.0q [15 Jan 2015]
*) Build fixes for the Windows and OpenVMS platforms
[Matt Caswell and Richard Levitte]
diff --git a/NEWS b/NEWS
index e86836d..448b24a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,11 @@
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.0p and OpenSSL 1.0.0q [under development]
+ Major changes between OpenSSL 1.0.0q and OpenSSL 1.0.0r [under development]
+
+ o
+
+ Major changes between OpenSSL 1.0.0p and OpenSSL 1.0.0q [15 Jan 2015]
o Build fixes for the Windows and OpenVMS platforms
diff --git a/README b/README
index 9bc6659..4f67e9e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.0q-dev
+ OpenSSL 1.0.0r-dev
Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile
index 60c876d..e89e0c0 100644
--- a/crypto/ecdsa/Makefile
+++ b/crypto/ecdsa/Makefile
@@ -126,16 +126,15 @@ ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
ecs_sign.o: ecs_locl.h ecs_sign.c
-ecs_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
-ecs_vrf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-ecs_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-ecs_vrf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-ecs_vrf.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-ecs_vrf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ecs_vrf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ecs_locl.h ecs_vrf.c
+ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index b871e00..7cd1fc4 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 0x10000110L
+#define OPENSSL_VERSION_NUMBER 0x10000120L
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0q-fips-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0r-fips-dev xx XXX xxxx"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0q-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0r-dev xx XXX xxxx"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index a6e807f..272ed98 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.0q
+Version: 1.0.0r
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries
More information about the openssl-commits
mailing list