summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2012-01-04 23:11:50 +0100
committerVlad Glagolev2012-01-08 07:04:56 +0400
commit6039b15ed6910466cfcfb8f41e66e3106b05724a (patch)
tree0b8d95ce34bcbc50ffbc7dc394a904c3ea2e966b
parent1a1f5df412d17c6c15a5036cd9a68c4fe782c204 (diff)
openssl 0.9.8s, SECURITY_PATCH=14
(cherry picked from commit 67470e61352fa8069c256c7073fe4ba663e4ed28)
-rwxr-xr-xcrypto/openssl/DETAILS4
-rw-r--r--crypto/openssl/HISTORY2
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 317da7d0ad..c195bf3820 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,8 +6,8 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8r
- SECURITY_PATCH=12
+ VERSION=0.9.8s
+ SECURITY_PATCH=14
;;
1.0)
VERSION=1.0.0f
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index e6c4541d25..04837c3762 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,5 +1,5 @@
2012-01-04 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 1.0.0f, SECURITY_PATCH=14
+ * DETAILS: 0.9.8s, 1.0.0f, SECURITY_PATCH=14
http://www.openssl.org/news/secadv_20120104.txt
2011-12-13 Vlad Glagolev <stealth@sourcemage.org>