[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  e91916692724ee7042b17d287dfbb91e20eb6128 (commit)
      from  f7201301ef001b70109d7007a37525e233d30907 (commit)


- Log -----------------------------------------------------------------
commit e91916692724ee7042b17d287dfbb91e20eb6128
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri May 22 11:21:11 2020 -0400

    Fix auto-gen names in .gitignore
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11916)

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

Summary of changes:
 .gitignore | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d15303e49b..1ea4cb71af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,10 +29,10 @@
 doc/man1/openssl-*.pod
 
 # Auto generated der files
-providers/common/der/der_dsa.c
-providers/common/der/der_ec.c
-providers/common/der/der_rsa.c
-providers/common/der/der_digests.c
+providers/common/der/der_digests_gen.c
+providers/common/der/der_dsa_gen.c
+providers/common/der/der_ec_gen.c
+providers/common/der/der_rsa_gen.c
 providers/common/include/prov/der_dsa.h
 providers/common/include/prov/der_ec.h
 providers/common/include/prov/der_rsa.h