Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 10
Star 18
Fork 1
T
Third Party Openssl
提交 59724e77 编写于 作者: H haixiangw 提交者： fengjiahui4
浏览文件
操作

fix CVE-2022-2068 

Signed-off-by: Nhaixiangw <wanghaixiang@huawei.com>
上级 49c25a90
隐藏空白更改
内联 并排
Showing with 108 addition and 106 deletion
tools/c_rehash.in
浏览文件 @ 59724e77
#!{- $config{HASHBANGPERL} -} #!{- $config{HASHBANGPERL} -}
# {- join("\n# ", @autowarntext) -} # {- join("\n# ", @autowarntext) -}
# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. # Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
# #
# Licensed under the OpenSSL license (the "License"). You may not use # Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy # this file except in compliance with the License. You can obtain a copy
...@@ -104,52 +104,78 @@ foreach (@dirlist) { ...@@ -104,52 +104,78 @@ foreach (@dirlist) {
} }
exit($errorcount); exit($errorcount);
sub copy_file {
my ($src_fname, $dst_fname) = @_;
if (open(my $in, "<", $src_fname)) {
if (open(my $out, ">", $dst_fname)) {
print $out $_ while (<$in>);
close $out;
} else {
warn "Cannot open $dst_fname for write, $!";
}
close $in;
} else {
warn "Cannot open $src_fname for read, $!";
}
}
sub hash_dir { sub hash_dir {
my %hashlist; my $dir = shift;
print "Doing $_[0]\n"; my %hashlist;
chdir $_[0];
opendir(DIR, "."); print "Doing $dir\n";
my @flist = sort readdir(DIR);
closedir DIR; if (!chdir $dir) {
if ( $removelinks ) { print STDERR "WARNING: Cannot chdir to '$dir', $!\n";
# Delete any existing symbolic links return;
foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) { }
if (-l $_) {
print "unlink $_" if $verbose; opendir(DIR, ".") || print STDERR "WARNING: Cannot opendir '.', $!\n";
unlink $_ || warn "Can't unlink $_, $!\n"; my @flist = sort readdir(DIR);
} closedir DIR;
} if ( $removelinks ) {
} # Delete any existing symbolic links
FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) { foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
# Check to see if certificates and/or CRLs present. if (-l $_) {
my ($cert, $crl) = check_file($fname); print "unlink $_\n" if $verbose;
if (!$cert && !$crl) { unlink $_ || warn "Can't unlink $_, $!\n";
print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; }
next; }
} }
link_hash_cert($fname) if ($cert); FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
link_hash_crl($fname) if ($crl); # Check to see if certificates and/or CRLs present.
} my ($cert, $crl) = check_file($fname);
if (!$cert && !$crl) {
print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
next;
}
link_hash_cert($fname) if ($cert);
link_hash_crl($fname) if ($crl);
}
chdir $pwd;
} }
sub check_file { sub check_file {
my ($is_cert, $is_crl) = (0,0); my ($is_cert, $is_crl) = (0,0);
my $fname = $_[0]; my $fname = $_[0];
open IN, $fname;
while(<IN>) { open(my $in, "<", $fname);
if (/^-----BEGIN (.*)-----/) { while(<$in>) {
my $hdr = $1; if (/^-----BEGIN (.*)-----/) {
if ($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) { my $hdr = $1;
$is_cert = 1; if ($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) {
last if ($is_crl); $is_cert = 1;
} elsif ($hdr eq "X509 CRL") { last if ($is_crl);
$is_crl = 1; } elsif ($hdr eq "X509 CRL") {
last if ($is_cert); $is_crl = 1;
} last if ($is_cert);
} }
} }
close IN; }
return ($is_cert, $is_crl); close $in;
return ($is_cert, $is_crl);
} }
...@@ -160,72 +186,48 @@ sub check_file { ...@@ -160,72 +186,48 @@ sub check_file {
# certificate fingerprints # certificate fingerprints
sub link_hash_cert { sub link_hash_cert {
my $fname = $_[0]; link_hash($_[0], 'cert');
$fname =~ s/'/'\\''/g;
my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
chomp $hash;
chomp $fprint;
$fprint =~ s/^.*=//;
$fprint =~ tr/://d;
my $suffix = 0;
# Search for an unused hash filename
while(exists $hashlist{"$hash.$suffix"}) {
# Hash matches: if fingerprint matches its a duplicate cert
if ($hashlist{"$hash.$suffix"} eq $fprint) {
print STDERR "WARNING: Skipping duplicate certificate $fname\n";
return;
}
$suffix++;
}
$hash .= ".$suffix";
if ($symlink_exists) {
print "link $fname -> $hash\n" if $verbose;
symlink $fname, $hash || warn "Can't symlink, $!";
} else {
print "copy $fname -> $hash\n" if $verbose;
if (open($in, "<", $fname)) {
if (open($out,">", $hash)) {
print $out $_ while (<$in>);
close $out;
} else {
warn "can't open $hash for write, $!";
}
close $in;
} else {
warn "can't open $fname for read, $!";
}
}
$hashlist{$hash} = $fprint;
} }
# Same as above except for a CRL. CRL links are of the form <hash>.r<n> # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
sub link_hash_crl { sub link_hash_crl {
my $fname = $_[0]; link_hash($_[0], 'crl');
$fname =~ s/'/'\\''/g; }
my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
chomp $hash; sub link_hash {
chomp $fprint; my ($fname, $type) = @_;
$fprint =~ s/^.*=//; my $is_cert = $type eq 'cert';
$fprint =~ tr/://d;
my $suffix = 0; my ($hash, $fprint) = compute_hash($openssl,
# Search for an unused hash filename $is_cert ? "x509" : "crl",
while(exists $hashlist{"$hash.r$suffix"}) { $is_cert ? $x509hash : $crlhash,
# Hash matches: if fingerprint matches its a duplicate cert "-fingerprint", "-noout",
if ($hashlist{"$hash.r$suffix"} eq $fprint) { "-in", $fname);
print STDERR "WARNING: Skipping duplicate CRL $fname\n"; chomp $hash;
return; chomp $fprint;
} return if !$hash;
$suffix++; $fprint =~ s/^.*=//;
} $fprint =~ tr/://d;
$hash .= ".r$suffix"; my $suffix = 0;
if ($symlink_exists) { # Search for an unused hash filename
print "link $fname -> $hash\n" if $verbose; my $crlmark = $is_cert ? "" : "r";
symlink $fname, $hash || warn "Can't symlink, $!"; while(exists $hashlist{"$hash.$crlmark$suffix"}) {
} else { # Hash matches: if fingerprint matches its a duplicate cert
print "cp $fname -> $hash\n" if $verbose; if ($hashlist{"$hash.$crlmark$suffix"} eq $fprint) {
system ("cp", $fname, $hash); my $what = $is_cert ? 'certificate' : 'CRL';
warn "Can't copy, $!" if ($? >> 8) != 0; print STDERR "WARNING: Skipping duplicate $what $fname\n";
} return;
$hashlist{$hash} = $fprint; }
$suffix++;
}
$hash .= ".$crlmark$suffix";
if ($symlink_exists) {
print "link $fname -> $hash\n" if $verbose;
symlink $fname, $hash || warn "Can't symlink, $!";
} else {
print "copy $fname -> $hash\n" if $verbose;
copy_file($fname, $hash);
}
$hashlist{$hash} = $fprint;
} }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或