Revert "CryptoPkg: Update process_files.pl to auto add PCD config option"

This reverts commit 499b0d5fa57dafe47b260aaf0cea6c6b0286e656.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Christopher Zurcher <christopher.zurcher@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Yi Li <yi1.li@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

1 files changed, 3 insertions, 74 deletions

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index 82e5176b39..7e18c9f52d 100755
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -81,19 +81,6 @@ my $uefi_config;
 my $extension;

 my $arch;

 my @inf;

-#

-# Use PCD to conditionally enable certain openssl features.

-# $conditional_feature contains pcd_name:fetures_names pairs

-# of conditional features.

-# @conditional_feature_dir contains relative_path:pcd_name pairs

-# of conditional features in openssl, MUST correspond to the content

-# in $conditional_feature.

-#

-# Configure list [openssl_configuration : new_define_list : new_file_list : pcd]

-# 1. no-ec : {NO_EC, NO_ECDH, NO_ECDSA, NO_TLS1_3, NO_SM2} : {/ec/, /sm2/} : PcdOpensslEcEnabled

-#

-my %conditional_feature = ("PcdOpensslEcEnabled"=>["EC", "ECDH", "ECDSA", "TLS1_3", "SM2"]);

-my %conditional_feature_dir = ("/ec/"=>"PcdOpensslEcEnabled", "/sm2/"=>"PcdOpensslEcEnabled");

 

 BEGIN {

     $inf_file = "OpensslLib.inf";

@@ -307,13 +294,7 @@ foreach my $product ((@{$unified_info{libraries}},
                 push @sslfilelist, '  $(OPENSSL_PATH)/' . $s . "\r\n";

                 next;

             }

-            push @cryptofilelist, '  $(OPENSSL_PATH)/' . $s;

-            foreach (keys(%conditional_feature_dir)) {

-                if ($s =~ $_) {

-                    push @cryptofilelist, '      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.' . $conditional_feature_dir{$_};

-                }

-            }

-            push @cryptofilelist, "\r\n";

+            push @cryptofilelist, '  $(OPENSSL_PATH)/' . $s . "\r\n";

         }

     }

 }

@@ -342,13 +323,7 @@ foreach (@headers){
     push @sslfilelist, '  $(OPENSSL_PATH)/' . $_ . "\r\n";

     next;

   }

-  push @cryptofilelist, '  $(OPENSSL_PATH)/' . $_;

-  foreach my $conditional_key (keys(%conditional_feature_dir)) {

-    if ($_ =~ $conditional_key) {

-        push @cryptofilelist, '      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.' . $conditional_feature_dir{$conditional_key};

-    }

-  }

-  push @cryptofilelist, "\r\n";

+  push @cryptofilelist, '  $(OPENSSL_PATH)/' . $_ . "\r\n";

 }

 

 

@@ -453,7 +428,7 @@ print "\n--> Duplicating opensslconf.h into Include/openssl ... ";
 system(

     "perl -pe 's/\\n/\\r\\n/' " .

     "< " . $OPENSSL_PATH . "/include/openssl/opensslconf.h " .

-    "> " . $OPENSSL_PATH . "/../../Include/openssl/opensslconf_generated.h"

+    "> " . $OPENSSL_PATH . "/../../Include/openssl/opensslconf.h"

     ) == 0 ||

     die "Cannot copy opensslconf.h!";

 print "Done!";

@@ -465,52 +440,6 @@ system(
     "> " . $OPENSSL_PATH . "/../../Include/crypto/dso_conf.h"

     ) == 0 ||

     die "Cannot copy dso_conf.h!";

-print "Done!";

-

-#

-# Add conditional feature to opensslconf.h

-#

-my $conf_file = "../Include/openssl/opensslconf.h";

-my @conf_raw = ();

-my @conditional_define = ();

-print "\n--> Updating conditional feature in $conf_file ... ";

-

-foreach my $pcd_name (keys(%conditional_feature)) {

-    push @conditional_define, "#if !FixedPcdGetBool ($pcd_name)\r\n";

-    foreach (@{$conditional_feature{$pcd_name}}) {

-        push @conditional_define, "# ifndef OPENSSL_NO_$_\r\n";

-        push @conditional_define, "#  define OPENSSL_NO_$_\r\n";

-        push @conditional_define, "# endif\r\n";

-    }

-    push @conditional_define, "#endif\r\n";

-}

-

-open( FD, "<" . $conf_file ) ||

-    die $conf_file;

-foreach (<FD>) {

-    # Insert conditional define to the begin of opensslconf.h

-    if ($_ =~ "Autogenerated conditional openssl feature list starts here") {

-        push @conf_raw, $_, @conditional_define;

-        $subbing = 1;

-        next;

-    }

-    if ($_ =~ "Autogenerated conditional openssl feature list ends here") {

-        push @conf_raw, $_;

-        $subbing = 0;

-        next;

-    }

-    push @conf_raw, $_

-        unless ($subbing);

-}

-close(FD) ||

-    die $conf_file;

-

-open( FD, ">" . $conf_file ) ||

-    die $conf_file;

-print( FD @conf_raw ) ||

-    die $conf_file;

-close(FD) ||

-    die $conf_file;

 print "Done!\n";

 

 print "\nProcessing Files Done!\n";