summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2014-08-07 13:27:52 +0400
committerVlad Glagolev2015-01-30 10:30:05 +0300
commitbf4a795097d5882e2d624b553319a4418be3ba34 (patch)
tree6908a95b9af08165227ac5f7baa409d019a8dbde
parenta78ef240b41b111e29887bed7987b469a6539171 (diff)
openssl: => 1.0.1i (1.0), 0.9.8zb (0.9) [security]
(cherry picked from commit 0fc4b9a254a36d38c07b3fbe62442ac377c3c5a2)
-rwxr-xr-xcrypto/openssl/DETAILS8
-rw-r--r--crypto/openssl/HISTORY6
-rw-r--r--crypto/openssl/openssl.gpgbin11771 -> 13314 bytes
3 files changed, 10 insertions, 4 deletions
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index a1090876f1..0fafa67735 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8za
- SECURITY_PATCH=21
+ VERSION=0.9.8zb
+ SECURITY_PATCH=22
;;
1.0)
- VERSION=1.0.1h
- SECURITY_PATCH=23
+ VERSION=1.0.1i
+ SECURITY_PATCH=24
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 783822dfca..bf91113038 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,9 @@
+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)
+ * openssl.gpg: imported 0E604491 public key (Matt Caswell
+ <matt@openssl.org>)
+
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)
diff --git a/crypto/openssl/openssl.gpg b/crypto/openssl/openssl.gpg
index 5b26b13a1f..d90e7dbac4 100644
--- a/crypto/openssl/openssl.gpg
+++ b/crypto/openssl/openssl.gpg
Binary files differ