Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10968469
D2627.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
D2627.diff
View Options
diff --git a/files/nodes.patch b/files/nodes.patch
--- a/files/nodes.patch
+++ b/files/nodes.patch
@@ -1,3 +1,16 @@
+From a755250039e57e39bd797d3ced97c71be81cd070 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves <pyu@riseup.net>
+Date: Wed, 28 Mar 2018 12:40:15 +0200
+Subject: [PATCH] nodes
+
+Signed-off-by: Pierre-Yves <pyu@riseup.net>
+---
+ crypto/cms/cms_kari.c | 5 -----
+ ssl/ssl.h | 2 +-
+ test/Makefile | 2 +-
+ test/tests.com | 8 +-------
+ 4 files changed, 3 insertions(+), 14 deletions(-)
+
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index ee28317..04c7723 100644
--- a/crypto/cms/cms_kari.c
@@ -15,34 +28,33 @@
kekcipher = EVP_aes_128_wrap();
else if (keylen <= 24)
diff --git a/ssl/ssl.h b/ssl/ssl.h
-index 90aeb0c..c509541 100644
+index 3cf96a2..9670028 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
-@@ -338,7 +338,8 @@ extern "C" {
+@@ -338,7 +338,7 @@ extern "C" {
* The following cipher list is used by default. It also is substituted when
* an application-defined cipher list string starts with 'DEFAULT'.
*/
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!LOW:!aNULL:!eNULL:!SSLv2"
+# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!LOW:!aNULL:!eNULL:!SSLv2:!EXPORT:!RC2:!DES:!3DES"
-+
/*
* As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
* starts with a reasonable order, and all we have to do for DEFAULT is
diff --git a/test/Makefile b/test/Makefile
-index 8f272ef..b201dfb 100644
+index a1f7eeb..a5aa467 100644
--- a/test/Makefile
+++ b/test/Makefile
-@@ -157,7 +157,7 @@ alltests: \
+@@ -158,7 +158,7 @@ alltests: \
test_enc test_x509 test_rsa test_crl test_sid \
test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
test_ss test_ca test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
- test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \
+ test_jpake test_srp test_ocsp test_v3name test_heartbeat \
test_constant_time test_verify_extra test_clienthello test_sslv2conftest \
- test_dtls test_bad_dtls
+ test_dtls test_bad_dtls test_fatalerr
diff --git a/test/tests.com b/test/tests.com
-index 59745e1..6595d16 100644
+index 27b01b6..7f6927d 100644
--- a/test/tests.com
+++ b/test/tests.com
@@ -56,7 +56,7 @@ $ tests := -
@@ -51,10 +63,10 @@
test_ss,test_ca,test_engine,test_evp,test_evp_extra,test_ssl,test_tsa,test_ige,-
- test_jpake,test_srp,test_cms,test_ocsp,test_v3name,test_heartbeat,-
+ test_jpake,test_srp,test_ocsp,test_v3name,test_heartbeat,-
- test_constant_time,test_verify_extra,test_clienthello,test_sslv2conftest,test_dtls
+ test_constant_time,test_verify_extra,test_clienthello,test_sslv2conftest,-
+ test_dtls,test_bad_dtls,test_fatalerr
$ endif
- $ tests = f$edit(tests,"COLLAPSE")
-@@ -368,12 +368,6 @@ $ test_jpake:
+@@ -371,12 +371,6 @@ $ test_jpake:
$ write sys$output "Test JPAKE"
$ mcr 'texe_dir''jpaketest'
$ return
@@ -67,3 +79,6 @@
$ test_srp:
$ write sys$output "Test SRP"
$ mcr 'texe_dir''srptest'
+--
+2.16.3
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,10 +1,9 @@
name : openssl
-version : 1.0.2n
-release : 31
+version : 1.0.2o
+release : 32
source :
- - https://www.openssl.org/source/openssl-1.0.2n.tar.gz : 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe
-license :
- - OpenSSL
+ - https://www.openssl.org/source/openssl-1.0.2o.tar.gz : ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
+license : OpenSSL
summary : Cryptographic tools required by many packages
component :
- system.base
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -53,7 +53,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="31">openssl</Dependency>
+ <Dependency release="32">openssl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/</Path>
@@ -67,8 +67,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="31">openssl-32bit</Dependency>
- <Dependency release="31">openssl-devel</Dependency>
+ <Dependency release="32">openssl-32bit</Dependency>
+ <Dependency release="32">openssl-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/lib*.a</Path>
@@ -83,7 +83,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="31">openssl</Dependency>
+ <Dependency release="32">openssl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -94,12 +94,12 @@
</Files>
</Package>
<History>
- <Update release="31">
- <Date>2017-12-08</Date>
- <Version>1.0.2n</Version>
+ <Update release="32">
+ <Date>2018-03-28</Date>
+ <Version>1.0.2o</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Jul 21, 6:22 PM (3 w, 10 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5834408
Default Alt Text
D2627.diff (5 KB)
Attached To
Mode
D2627: Update openssl to 1.0.2o to address CVE-2018-0739
Attached
Detach File
Event Timeline
Log In to Comment