summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2014-10-15 19:57:01 +0200
committerVlad Glagolev2015-01-30 10:31:52 +0300
commit98fa34288886ab5fa59dc522122b9e59f7995c33 (patch)
tree2808f6dd4ef277a8e1446e24d6f86c18ae7cff4f
parentbf4a795097d5882e2d624b553319a4418be3ba34 (diff)
crypto/openssl: versions 0.9.8zc and 1.0.1j, fixes CVE-2014-3513, CVE-2014-3567, CVE-2014-3568
(cherry picked from commit 6008ba006698e290bed753e2a7a946e724d0364f) Conflicts: crypto/openssl/HISTORY
-rwxr-xr-xcrypto/openssl/DETAILS8
-rw-r--r--crypto/openssl/HISTORY4
2 files changed, 8 insertions, 4 deletions
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 0fafa67735..e9c50d42e9 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8zb
- SECURITY_PATCH=22
+ VERSION=0.9.8zc
+ SECURITY_PATCH=23
;;
1.0)
- VERSION=1.0.1i
- SECURITY_PATCH=24
+ VERSION=1.0.1j
+ SECURITY_PATCH=25
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index bf91113038..6765458a68 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2014-10-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: versions 1.0.1j and 0.9.8zc, SECURITY_PATCH++, fixes
+ for CVE-2014-3513, CVE-2014-3567, CVE-2014-3568
+
2014-08-07 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.0.1i (branch 1.0), 0.9.8zb (branch 0.9);
SECURITY_PATCH++ (9 CVEs)