[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  21d1994faf7f6e41ad3221caeab2385e3aaba892 (commit)
      from  57e7401fc5c6af8e9266a721be669a3b70fbfb3f (commit)


- Log -----------------------------------------------------------------
commit 21d1994faf7f6e41ad3221caeab2385e3aaba892
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Apr 15 16:16:59 2021 +0100

    Don't worry about magic in the Makefile for 3.0
    
    We remove a TODO(3.0) from the unix Makefile template. The current
    approach works. It can be improved later.
    
    Fixes #14403
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14887)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 64c5faff18..c4755c54cd 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1696,7 +1696,7 @@ EOF
                  @{$args{objs}};
       my @deps = compute_lib_depends(@{$args{deps}});
       my $shared_def = join("", map { ' '.$target{shared_defflag}.$_ } @defs);
-      # TODO(3.0): next line needs to become "less magic" (see PR #11950)
+      # Next line needs to become "less magic" (see PR #11950)
       $shared_def .= ' '.$target{shared_fipsflag} if (m/providers\/fips/ && defined $target{shared_fipsflag});
       my $objs = join(" \\\n\t\t", fill_lines(' ', $COLUMNS - 16, @objs));
       my $deps = join(" \\\n" . ' ' x (length($dso) + 2),