From 543dd3690c86cae33802acfb268275908457cf52 Mon Sep 17 00:00:00 2001 From: Ashish Kulkarni Date: Mon, 6 Apr 2015 23:15:22 +0530 Subject: [PATCH] update OpenSSL to 1.0.1m (and release 0.12.2.2 for Windows) --- CHANGELOG.md | 4 ++++ VERSION | 2 +- scripts/build.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed154c6c4..d47f634b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +v0.12.2.2 (2015-04-06) +---------------------- +* update OpenSSL to 1.0.1m + v0.12.2.1 (2015-01-19) ---------------------- * update OpenSSL to 1.0.1l diff --git a/VERSION b/VERSION index 5c494596d..1dd4c2cc1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.12.2.1 \ No newline at end of file +0.12.2.2 \ No newline at end of file diff --git a/scripts/build.py b/scripts/build.py index 82d472964..1225c9547 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -370,8 +370,8 @@ DEPENDENT_LIBS = { 'openssl': { 'order' : 1, - 'url' : 'https://www.openssl.org/source/openssl-1.0.1l.tar.gz', - 'sha1' : '4547a0b4269acf76b1f9e7d188896867d6fc8c18', + 'url' : 'https://www.openssl.org/source/openssl-1.0.1m.tar.gz', + 'sha1' : '4ccaf6e505529652f9fdafa01d1d8300bd9f3179', 'build' : { 'msvc*-win32*': { 'result': ['include/openssl/ssl.h', 'lib/ssleay32.lib', 'lib/libeay32.lib'],