[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e378be2a29f8bc5e679e63d5f5e9766d2f4dfc4b (commit)
      from  691e2efa62e5d4c46b725ddb54481a0970f7347b (commit)


- Log -----------------------------------------------------------------
commit e378be2a29f8bc5e679e63d5f5e9766d2f4dfc4b
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat May 29 11:15:40 2021 +0200

    Add .asn1 dependencies for files generated from providers/common/der/*.in
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/15533)

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

Summary of changes:
 providers/common/der/build.info | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/providers/common/der/build.info b/providers/common/der/build.info
index 35c6787e98..87ac2eb11c 100644
--- a/providers/common/der/build.info
+++ b/providers/common/der/build.info
@@ -3,11 +3,11 @@ $DER_DIGESTS_H=../include/prov/der_digests.h
 $DER_DIGESTS_GEN=der_digests_gen.c
 
 GENERATE[$DER_DIGESTS_GEN]=der_digests_gen.c.in
-DEPEND[$DER_DIGESTS_GEN]=oids_to_c.pm
+DEPEND[$DER_DIGESTS_GEN]=oids_to_c.pm NIST.asn1 DIGESTS.asn1
 
 DEPEND[${DER_DIGESTS_GEN/.c/.o}]=$DER_DIGESTS_H
 GENERATE[$DER_DIGESTS_H]=der_digests.h.in
-DEPEND[$DER_DIGESTS_H]=oids_to_c.pm
+DEPEND[$DER_DIGESTS_H]=oids_to_c.pm NIST.asn1 DIGESTS.asn1
 
 #----- RSA
 $DER_RSA_H=../include/prov/der_rsa.h
@@ -17,12 +17,12 @@ $DER_RSA_COMMON=$DER_RSA_GEN der_rsa_key.c
 $DER_RSA_FIPSABLE=der_rsa_sig.c
 
 GENERATE[$DER_RSA_GEN]=der_rsa_gen.c.in
-DEPEND[$DER_RSA_GEN]=oids_to_c.pm
+DEPEND[$DER_RSA_GEN]=oids_to_c.pm NIST.asn1 RSA.asn1
 
 DEPEND[${DER_RSA_AUX/.c/.o}]=$DER_RSA_H $DER_DIGESTS_H
 DEPEND[${DER_RSA_GEN/.c/.o}]=$DER_RSA_H
 GENERATE[$DER_RSA_H]=der_rsa.h.in
-DEPEND[$DER_RSA_H]=oids_to_c.pm
+DEPEND[$DER_RSA_H]=oids_to_c.pm NIST.asn1 RSA.asn1
 
 #----- DSA
 IF[{- !$disabled{dsa} -}]
@@ -31,12 +31,12 @@ IF[{- !$disabled{dsa} -}]
   $DER_DSA_AUX=der_dsa_key.c der_dsa_sig.c
 
   GENERATE[$DER_DSA_GEN]=der_dsa_gen.c.in
-  DEPEND[$DER_DSA_GEN]=oids_to_c.pm
+  DEPEND[$DER_DSA_GEN]=oids_to_c.pm DSA.asn1
 
   DEPEND[${DER_DSA_AUX/.c/.o}]=$DER_DSA_H $DER_DIGESTS_H
   DEPEND[${DER_DSA_GEN/.c/.o}]=$DER_DSA_H
   GENERATE[$DER_DSA_H]=der_dsa.h.in
-  DEPEND[$DER_DSA_H]=oids_to_c.pm
+  DEPEND[$DER_DSA_H]=oids_to_c.pm DSA.asn1
 ENDIF
 
 #----- EC
@@ -46,12 +46,12 @@ IF[{- !$disabled{ec} -}]
   $DER_EC_AUX=der_ec_key.c der_ec_sig.c
 
   GENERATE[$DER_EC_GEN]=der_ec_gen.c.in
-  DEPEND[$DER_EC_GEN]=oids_to_c.pm
+  DEPEND[$DER_EC_GEN]=oids_to_c.pm EC.asn1
 
   DEPEND[${DER_EC_AUX/.c/.o}]=$DER_EC_H $DER_DIGESTS_H
   DEPEND[${DER_EC_GEN/.c/.o}]=$DER_EC_H
   GENERATE[$DER_EC_H]=der_ec.h.in
-  DEPEND[$DER_EC_H]=oids_to_c.pm
+  DEPEND[$DER_EC_H]=oids_to_c.pm EC.asn1
 ENDIF
 
 #----- ECX
@@ -61,12 +61,12 @@ IF[{- !$disabled{ec} -}]
   $DER_ECX_AUX=der_ecx_key.c
 
   GENERATE[$DER_ECX_GEN]=der_ecx_gen.c.in
-  DEPEND[$DER_ECX_GEN]=oids_to_c.pm
+  DEPEND[$DER_ECX_GEN]=oids_to_c.pm ECX.asn1
 
   DEPEND[${DER_ECX_AUX/.c/.o}]=$DER_ECX_H
   DEPEND[${DER_ECX_GEN/.c/.o}]=$DER_ECX_H
   GENERATE[$DER_ECX_H]=der_ecx.h.in
-  DEPEND[$DER_ECX_H]=oids_to_c.pm
+  DEPEND[$DER_ECX_H]=oids_to_c.pm ECX.asn1
 ENDIF
 
 #----- KEY WRAP
@@ -74,11 +74,11 @@ $DER_WRAP_H=../include/prov/der_wrap.h
 $DER_WRAP_GEN=der_wrap_gen.c
 
 GENERATE[$DER_WRAP_GEN]=der_wrap_gen.c.in
-DEPEND[$DER_WRAP_GEN]=oids_to_c.pm
+DEPEND[$DER_WRAP_GEN]=oids_to_c.pm wrap.asn1
 
 DEPEND[${DER_WRAP_GEN/.c/.o}]=$DER_WRAP_H
 GENERATE[$DER_WRAP_H]=der_wrap.h.in
-DEPEND[$DER_WRAP_H]=oids_to_c.pm
+DEPEND[$DER_WRAP_H]=oids_to_c.pm wrap.asn1
 
 #----- SM2
 IF[{- !$disabled{sm2} -}]
@@ -87,12 +87,12 @@ IF[{- !$disabled{sm2} -}]
   $DER_SM2_AUX=der_sm2_key.c der_sm2_sig.c
 
   GENERATE[$DER_SM2_GEN]=der_sm2_gen.c.in
-  DEPEND[$DER_SM2_GEN]=oids_to_c.pm
+  DEPEND[$DER_SM2_GEN]=oids_to_c.pm SM2.asn1
 
   DEPEND[${DER_SM2_AUX/.c/.o}]=$DER_SM2_H $DER_EC_H
   DEPEND[${DER_SM2_GEN/.c/.o}]=$DER_SM2_H
   GENERATE[$DER_SM2_H]=der_sm2.h.in
-  DEPEND[$DER_SM2_H]=oids_to_c.pm
+  DEPEND[$DER_SM2_H]=oids_to_c.pm SM2.asn1
 ENDIF
 
 #----- Conclusion