summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2014-06-05 16:20:41 +0400
committerVlad Glagolev2015-01-30 10:30:00 +0300
commita78ef240b41b111e29887bed7987b469a6539171 (patch)
tree4ef56aa29e5af65013ebe8a19c2b3292f8ccdf28
parent77bf98f3bc647edc11b6dcb07c5d42155046b7bb (diff)
openssl: => 1.0.1h (1.0), 0.9.8za (0.9) [security]
(cherry picked from commit 5341e4ebfa9593756ad8b1c242af18a9dc54cba6)
-rwxr-xr-xcrypto/openssl/DETAILS9
-rw-r--r--crypto/openssl/HISTORY4
2 files changed, 8 insertions, 5 deletions
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 518f3e016c..a1090876f1 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,13 +6,12 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8y
- SECURITY_PATCH=20
+ VERSION=0.9.8za
+ SECURITY_PATCH=21
;;
1.0)
- VERSION=1.0.1g
- SECURITY_PATCH=22
- PATCHLEVEL=0
+ VERSION=1.0.1h
+ SECURITY_PATCH=23
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 7d7f8c98b5..783822dfca 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2014-06-05 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell (branch 1.0) to 1.0.1h, (branch 0.9) to
+ 0.9.8za; SECURITY_PATCH++ (7 CVEs)
+
2014-04-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.1g, SECURITY_PATCH=22, CVE-2014-0160
* openssl.gpg: import key FA40E9E2