From b4b10990c47163f8a782eefe293e89be0152f6e1 Mon Sep 17 00:00:00 2001 From: Tapas Kundu Date: Tue, 26 May 2020 09:48:56 +0000 Subject: [PATCH] openssl: update openssl to 1.0.2v Updated openssl to 1.0.2v to include this PR: https://github.com/openssl/openssl/pull/11361 Also, removed changes in tools/c_rehash as this repo have tools/c_rehash.in which will reflect the changes in tools/c_rehash. Change-Id: Iacba3c048365374b672fa9c8350d77d128c71fbb Signed-off-by: Tapas Kundu Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/10154 Tested-by: gerrit-photon Reviewed-by: Anish Swaminathan --- SPECS/openssl/c_rehash.patch | 32 -------------------------------- SPECS/openssl/openssl.spec | 13 ++++++++----- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/SPECS/openssl/c_rehash.patch b/SPECS/openssl/c_rehash.patch index 59d4fc7ee5..cb0a9c5310 100644 --- a/SPECS/openssl/c_rehash.patch +++ b/SPECS/openssl/c_rehash.patch @@ -1,35 +1,3 @@ ---- openssl-1.0.2d-orig/tools/c_rehash 2015-07-09 05:03:10.000000000 -0700 -+++ openssl-1.0.2d/tools/c_rehash 2015-12-02 16:09:42.984877370 -0800 -@@ -165,14 +165,14 @@ - $hash .= ".$suffix"; - if ($symlink_exists) { - symlink $fname, $hash; -- print "link $fname -> $hash\n" if $verbose; -+ print "link $fname => $hash\n"; - } else { - open IN,"<$fname" or die "can't open $fname for read"; - open OUT,">$hash" or die "can't open $hash for write"; - print OUT ; # does the job for small text files - close OUT; - close IN; -- print "copy $fname -> $hash\n" if $verbose; -+ print "copy $fname => $hash\n"; - } - $hashlist{$hash} = $fprint; - } -@@ -200,10 +200,10 @@ - $hash .= ".r$suffix"; - if ($symlink_exists) { - symlink $fname, $hash; -- print "link $fname -> $hash\n" if $verbose; -+ print "link $fname => $hash\n"; - } else { - system ("cp", $fname, $hash); -- print "cp $fname -> $hash\n" if $verbose; -+ print "cp $fname => $hash\n"; - } - $hashlist{$hash} = $fprint; - } --- openssl-1.0.2d-orig/tools/c_rehash.in 2015-07-09 04:57:15.000000000 -0700 +++ openssl-1.0.2d/tools/c_rehash.in 2015-12-02 16:10:33.404878794 -0800 @@ -165,14 +165,14 @@ diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index 225814fac4..00666101e3 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -1,14 +1,14 @@ Summary: Management tools and libraries relating to cryptography Name: openssl -Version: 1.0.2u -Release: 3%{?dist} +Version: 1.0.2v +Release: 1%{?dist} License: OpenSSL URL: http://www.openssl.org Group: System Environment/Security Vendor: VMware, Inc. Distribution: Photon -Source0: http://www.openssl.org/source/%{name}-%{version}.tar.gz -%define sha1 openssl=740916d79ab0d209d2775277b1c6c3ec2f6502b2 +Source0: http://www.openssl.org/source/vmware-OpenSSL_1_0_2v.tar.gz +%define sha1 vmware-OpenSSL_1_0_2v=8eb5f7b178b9b6824b183e44d9986c5045557031 Source1: rehash_ca_certificates.sh Patch0: c_rehash.patch Patch1: openssl-ipv6apps.patch @@ -54,7 +54,7 @@ Requires: openssl = %{version}-%{release} Perl scripts that convert certificates and keys to various formats. %prep -%setup -q +%setup -q -n vmware-OpenSSL_1_0_2v %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -124,6 +124,9 @@ rm -rf %{buildroot}/* /%{_bindir}/rehash_ca_certificates.sh %changelog +* Tue May 26 2020 Tapas Kundu 1.0.2v-1 +- Update to 1.0.2v. +- Included fix for Implement blinding for scalar multiplication. * Fri Feb 07 2020 Tapas Kundu 1.0.2u-3 - Use fips 2.0.20 * Fri Jan 31 2020 Anish Swaminathan 1.0.2u-2