[openssl-commits] [openssl] OpenSSL_1_0_2-stable update
Matt Caswell
matt at openssl.org
Thu Jan 22 16:37:07 UTC 2015
The branch OpenSSL_1_0_2-stable has been updated
via 06aab26874279547da6e2c877ad84c849fcb8ac0 (commit)
via 4ac0329582829f5378d8078c8d314ad37db87736 (commit)
via 51e647f6e50d16582838eec51eafe503413c4af7 (commit)
from ba7e998d5b464ccbbb9dbf0790186a57fee6e9cd (commit)
- Log -----------------------------------------------------------------
commit 06aab26874279547da6e2c877ad84c849fcb8ac0
Author: Matt Caswell <matt at openssl.org>
Date: Thu Jan 22 16:16:24 2015 +0000
Prepare for 1.0.2a-dev
Reviewed-by: Stephen Henson <steve at openssl.org>
commit 4ac0329582829f5378d8078c8d314ad37db87736
Author: Matt Caswell <matt at openssl.org>
Date: Thu Jan 22 16:12:26 2015 +0000
Prepare for 1.0.2 release
Reviewed-by: Stephen Henson <steve at openssl.org>
commit 51e647f6e50d16582838eec51eafe503413c4af7
Author: Matt Caswell <matt at openssl.org>
Date: Thu Jan 22 16:12:26 2015 +0000
make update
Reviewed-by: Stephen Henson <steve at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 6 +++++-
NEWS | 6 +++++-
README | 2 +-
crypto/bn/Makefile | 1 -
crypto/opensslv.h | 6 +++---
crypto/stack/safestack.h | 1 -
openssl.spec | 2 +-
7 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/CHANGES b/CHANGES
index 8833a4c..c1a07d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
OpenSSL CHANGES
_______________
- Changes between 1.0.1l and 1.0.2 [xx XXX xxxx]
+ Changes between 1.0.2 and 1.0.2a [xx XXX xxxx]
+
+ *)
+
+ Changes between 1.0.1l and 1.0.2 [22 Jan 2015]
*) SRTP Memory Leak.
diff --git a/NEWS b/NEWS
index d8f5986..41e5bdb 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.1l and OpenSSL 1.0.2 [in beta]:
+ Major changes between OpenSSL 1.0.2 and OpenSSL 1.0.2a [under development]
+
+ o
+
+ Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.2 [22 Jan 2015]:
o Suite B support for TLS 1.2 and DTLS 1.2
o Support for DTLS 1.2
diff --git a/README b/README
index 1f0c706..89b7ac3 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.2-beta4-dev
+ OpenSSL 1.0.2a-dev
Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index f1eb639..0cdbd20 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -253,7 +253,6 @@ bn_exp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
bn_exp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
bn_exp.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_exp.c bn_lcl.h
-bn_exp.o: rsaz_exp.h
bn_exp2.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 5570945..f0a9432 100644
--- a/crypto/opensslv.h
+++ b/crypto/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 0x10002004L
+# define OPENSSL_VERSION_NUMBER 0x10002010L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2-beta4-fips-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2a-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2-beta4-dev xx XXX xxxx"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2a-dev xx XXX xxxx"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 431064e..1d4f87e 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -2666,7 +2666,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
# define lh_SSL_SESSION_stats_bio(lh,out) \
LHM_lh_stats_bio(SSL_SESSION,lh,out)
# define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-/* End of util/mkstack.pl block, you may now edit :-) */
#ifdef __cplusplus
}
#endif
diff --git a/openssl.spec b/openssl.spec
index c90dc69..909f2bf 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.2
+Version: 1.0.2a
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries
More information about the openssl-commits
mailing list