Skip to content

Commit

Permalink
openssl: update openssl to 1.0.2v
Browse files Browse the repository at this point in the history
Updated openssl to 1.0.2v to include this PR:
openssl/openssl#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 <tkundu@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/10154
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
  • Loading branch information
tapakund authored and suezzelur committed Jun 1, 2020
1 parent 285fba4 commit b4b1099
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 37 deletions.
32 changes: 0 additions & 32 deletions 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 <IN>; # 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 @@
Expand Down
13 changes: 8 additions & 5 deletions 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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -124,6 +124,9 @@ rm -rf %{buildroot}/*
/%{_bindir}/rehash_ca_certificates.sh

%changelog
* Tue May 26 2020 Tapas Kundu <tkundu@vmware.com> 1.0.2v-1
- Update to 1.0.2v.
- Included fix for Implement blinding for scalar multiplication.
* Fri Feb 07 2020 Tapas Kundu <tkundu@vmware.com> 1.0.2u-3
- Use fips 2.0.20
* Fri Jan 31 2020 Anish Swaminathan <anishs@vmware.com> 1.0.2u-2
Expand Down

0 comments on commit b4b1099

Please sign in to comment.