From nobody Sat Apr 20 13:10:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59632+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59632+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1589517613; cv=none; d=zohomail.com; s=zohoarc; b=ZpbjtOM+9ZP+2pI4Lxe5dt6x/n3NO7/A0UGeIMY+7Ni4DJGEZPgvd0hrC1reegmAOasntUt5nMdb5PRblNWekalt7asfL1wP2O+5HoZfkupMrFMnsyM82jyA4e29xs2dLjMvhZL8ATatIwO7ETYBZcISwWtDwddKJ+hPdekA5lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589517613; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=2pfXBtQFCUhr9E08f2cDcwARxVx4ONweSrU/8GmfHiU=; b=mi1auXl9GaH5s2NvzuTuqIXUKkUTopADEOgthWqGAPYkU9kYdkwp6TQBay7oxv5+1jbIUaJSCxRpi31iSfF+qurN72HvDUEGwBV3LwQJzl0llPH2Szhjj+F5GCSoOxhFjSbUnxFLwVmN1GxNUfhrYLtUgramEezyirdUlsMpeDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59632+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589517613398133.8943320535824; Thu, 14 May 2020 21:40:13 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id eOCHYY1788612xae2jILQgBn; Thu, 14 May 2020 21:40:12 -0700 X-Received: from mga18.intel.com (mga18.intel.com []) by mx.groups.io with SMTP id smtpd.web12.7588.1589517603632873743 for ; Thu, 14 May 2020 21:40:09 -0700 IronPort-SDR: 4avLFzlgzk1617+tCQgn+QHTSA1bWVIkNRjo8BVhykXhRYZDV7NXvNQMyxoTQyue91yeJjmr+O fZlidyvBe+zg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2020 21:40:08 -0700 IronPort-SDR: 3ssWWnFIBkivxobhqVFOGelpmGiaqtispxpfGgmmNJUn6K6Ob6gG42wN4sCDjLLBUmevnaNHxq OFEc9qyYTW5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,394,1583222400"; d="scan'208";a="307317463" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.33.114]) by FMSMGA003.fm.intel.com with ESMTP; 14 May 2020 21:40:06 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jian J Wang , Xiaoyu Lu , Siyuan Fu , Michael D Kinney , Jiewen Yao , Philippe Mathieu-Daude Subject: [edk2-devel] [PATCH V6 03/13] CryptoPkg/OpensslLib: Set MD4 disable in OpensslLib Date: Fri, 15 May 2020 12:39:38 +0800 Message-Id: <20200515043948.15028-4-zhichao.gao@intel.com> In-Reply-To: <20200515043948.15028-1-zhichao.gao@intel.com> References: <20200515043948.15028-1-zhichao.gao@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhichao.gao@intel.com X-Gm-Message-State: GmFvgvpqRo7TUxCKweCvUpa6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589517612; bh=FrSaUNn3s9j7vEMh02ht+8vrCSeIWsLk4Zqmxqk5uhg=; h=Cc:Date:From:Reply-To:Subject:To; b=Ucu50v3UfZ03UL5Y96+rV7vNBAmY/8eQcyV0/LXAQOjlVOQOFOpYH6qzRWziiDX/O/K xkcclfDc6Rfgt2AaxlNZwuB7pPNZ84kcyt8ywAsgOFHqnWJSfAer4iICxrFd1jRV4MHs3 tA+NRz0xgzajp5M+FZGFSPRTPhQcdeSfu3E= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1898 This patch is create by adding the setting "no_md4" of process_files.pl and running it thru perl. It would remove the MD4 from OpensslLib. Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Siyuan Fu Cc: Michael D Kinney Cc: Jiewen Yao Cc: Philippe Mathieu-Daude Reviewed-by: Jian J Wang Signed-off-by: Zhichao Gao --- V6: Change the line ending of opensslconfig.h from '\n' to '\r\n'. CryptoPkg/Library/Include/openssl/opensslconf.h | 3 +++ CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 --- CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 3 --- CryptoPkg/Library/OpensslLib/process_files.pl | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Li= brary/Include/openssl/opensslconf.h index bd34e53ef2..70d24f99ac 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -61,6 +61,9 @@ extern "C" { #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif +#ifndef OPENSSL_NO_MD4 +# define OPENSSL_NO_MD4 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index 9ed0175553..10710e4a7c 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -294,8 +294,6 @@ $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c $(OPENSSL_PATH)/crypto/lhash/lh_stats.c $(OPENSSL_PATH)/crypto/lhash/lhash.c - $(OPENSSL_PATH)/crypto/md4/md4_dgst.c - $(OPENSSL_PATH)/crypto/md4/md4_one.c $(OPENSSL_PATH)/crypto/md5/md5_dgst.c $(OPENSSL_PATH)/crypto/md5/md5_one.c $(OPENSSL_PATH)/crypto/mem.c @@ -525,7 +523,6 @@ $(OPENSSL_PATH)/crypto/evp/evp_locl.h $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h - $(OPENSSL_PATH)/crypto/md4/md4_locl.h $(OPENSSL_PATH)/crypto/md5/md5_locl.h $(OPENSSL_PATH)/crypto/modes/modes_lcl.h $(OPENSSL_PATH)/crypto/objects/obj_dat.h diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index 03da266627..d9782a3098 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -294,8 +294,6 @@ $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c $(OPENSSL_PATH)/crypto/lhash/lh_stats.c $(OPENSSL_PATH)/crypto/lhash/lhash.c - $(OPENSSL_PATH)/crypto/md4/md4_dgst.c - $(OPENSSL_PATH)/crypto/md4/md4_one.c $(OPENSSL_PATH)/crypto/md5/md5_dgst.c $(OPENSSL_PATH)/crypto/md5/md5_one.c $(OPENSSL_PATH)/crypto/mem.c @@ -525,7 +523,6 @@ $(OPENSSL_PATH)/crypto/evp/evp_locl.h $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h - $(OPENSSL_PATH)/crypto/md4/md4_locl.h $(OPENSSL_PATH)/crypto/md5/md5_locl.h $(OPENSSL_PATH)/crypto/modes/modes_lcl.h $(OPENSSL_PATH)/crypto/objects/obj_dat.h diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Libr= ary/OpensslLib/process_files.pl index 4ba25da407..bd4a84da24 100755 --- a/CryptoPkg/Library/OpensslLib/process_files.pl +++ b/CryptoPkg/Library/OpensslLib/process_files.pl @@ -73,6 +73,7 @@ BEGIN { "no-gost", "no-hw", "no-idea", + "no-md4", "no-mdc2", "no-pic", "no-ocb", --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59632): https://edk2.groups.io/g/devel/message/59632 Mute This Topic: https://groups.io/mt/74221326/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-