From nobody Sun Apr 28 22:53:24 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1492597115055515.7346057572463; Wed, 19 Apr 2017 03:18:35 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 7742B2050A7AA; Wed, 19 Apr 2017 03:18:33 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7C9632095C3C7 for ; Wed, 19 Apr 2017 03:18:32 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2017 03:18:32 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga001.jf.intel.com with ESMTP; 19 Apr 2017 03:18:29 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,220,1488873600"; d="scan'208";a="1121302015" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Wed, 19 Apr 2017 18:18:15 +0800 Message-Id: <1492597098-35836-2-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> References: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 1/4] BaseTools/VolInfo: Update OPENSSL_PATH to support space characters X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update OPENSSL_PATH handling to support space characters in the Path. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/C/VolInfo/VolInfo.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolI= nfo/VolInfo.c index eff5f9e..a695529 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -329,11 +329,14 @@ Returns: OpenSslCommand =3D "openssl"; OpenSslEnv =3D getenv("OPENSSL_PATH"); if (OpenSslEnv =3D=3D NULL) { OpenSslPath =3D OpenSslCommand; } else { - OpenSslPath =3D malloc(strlen(OpenSslEnv)+strlen(OpenSslCommand)+1= ); + // + // We add quotes to the Openssl Path in case it has space characte= rs + // + OpenSslPath =3D malloc(2+strlen(OpenSslEnv)+strlen(OpenSslCommand)= +1); if (OpenSslPath =3D=3D NULL) { Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!"); return GetUtilityStatus (); } CombinePath(OpenSslEnv, OpenSslCommand, OpenSslPath); @@ -1589,15 +1592,16 @@ CombinePath ( OUT CHAR8* NewPath ) { UINT32 DefaultPathLen; UINT64 Index; - + CHAR8 QuotesStr[] =3D "\""; + strcpy(NewPath, QuotesStr); DefaultPathLen =3D strlen(DefaultPath); - strcpy(NewPath, DefaultPath); + strcat(NewPath, DefaultPath); Index =3D 0; - for (; Index < DefaultPathLen; Index ++) { + for (; Index < DefaultPathLen + 1; Index ++) { if (NewPath[Index] =3D=3D '\\' || NewPath[Index] =3D=3D '/') { if (NewPath[Index + 1] !=3D '\0') { NewPath[Index] =3D '/'; } } @@ -1605,10 +1609,11 @@ CombinePath ( if (NewPath[Index -1] !=3D '/') { NewPath[Index] =3D '/'; NewPath[Index + 1] =3D '\0'; } strcat(NewPath, AppendPath); + strcat(NewPath, QuotesStr); return EFI_SUCCESS; } =20 EFI_STATUS ParseSection ( --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun Apr 28 22:53:24 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1492597119088249.8643843214586; Wed, 19 Apr 2017 03:18:39 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A7D1D2050A7AD; Wed, 19 Apr 2017 03:18:37 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E45AA21954066 for ; Wed, 19 Apr 2017 03:18:36 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2017 03:18:36 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga001.jf.intel.com with ESMTP; 19 Apr 2017 03:18:32 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,220,1488873600"; d="scan'208";a="1121302035" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Wed, 19 Apr 2017 18:18:16 +0800 Message-Id: <1492597098-35836-3-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> References: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 2/4] BaseTools: Pkcs7Sign Tool to support OPENSSL_PATH has space X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update Pkcs7Sign Tool to support the case that OPENSSL_PATH has space characters. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Sou= rce/Python/Pkcs7Sign/Pkcs7Sign.py index ef79f80..de85756 100644 --- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py +++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py @@ -100,10 +100,12 @@ if __name__ =3D=3D '__main__': # OpenSslCommand =3D 'openssl' try: OpenSslPath =3D os.environ['OPENSSL_PATH'] OpenSslCommand =3D os.path.join(OpenSslPath, OpenSslCommand) + if ' ' in OpenSslCommand: + OpenSslCommand =3D '"' + OpenSslCommand + '"' except: pass =20 # # Verify that Open SSL command is available --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun Apr 28 22:53:24 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1492597124462722.452467635353; Wed, 19 Apr 2017 03:18:44 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 121692050A7B4; Wed, 19 Apr 2017 03:18:43 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B426C21954066 for ; Wed, 19 Apr 2017 03:18:41 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2017 03:18:41 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga001.jf.intel.com with ESMTP; 19 Apr 2017 03:18:38 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,220,1488873600"; d="scan'208";a="1121302047" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Wed, 19 Apr 2017 18:18:17 +0800 Message-Id: <1492597098-35836-4-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> References: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 3/4] BaseTools: Rsa2048Sha256Sign Tool to support OPENSSL_PATH has space X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update Rsa2048Sha256Sign Tool to support the case that OPENSSL_PATH has space characters. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py= b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py index 4367194..1ae6ebb 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -83,10 +83,12 @@ if __name__ =3D=3D '__main__': # OpenSslCommand =3D 'openssl' try: OpenSslPath =3D os.environ['OPENSSL_PATH'] OpenSslCommand =3D os.path.join(OpenSslPath, OpenSslCommand) + if ' ' in OpenSslCommand: + OpenSslCommand =3D '"' + OpenSslCommand + '"' except: pass =20 # # Verify that Open SSL command is available --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun Apr 28 22:53:24 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1492597130641423.8108293770106; Wed, 19 Apr 2017 03:18:50 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 40F9E2050A7B8; Wed, 19 Apr 2017 03:18:49 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4069E2050A7B7 for ; Wed, 19 Apr 2017 03:18:46 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2017 03:18:46 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga001.jf.intel.com with ESMTP; 19 Apr 2017 03:18:42 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,220,1488873600"; d="scan'208";a="1121302068" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Wed, 19 Apr 2017 18:18:18 +0800 Message-Id: <1492597098-35836-5-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> References: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 4/4] BaseTools: Rsa2048Sha256GenerateKeys to support OPENSSL_PATH has space X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update Rsa2048Sha256GenerateKeys Tool to support the case that OPENSSL_PATH has space characters. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py | 2= ++ 1 file changed, 2 insertions(+) diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Generat= eKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateK= eys.py index df2d989..95a6369 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py @@ -62,10 +62,12 @@ if __name__ =3D=3D '__main__': # OpenSslCommand =3D 'openssl' try: OpenSslPath =3D os.environ['OPENSSL_PATH'] OpenSslCommand =3D os.path.join(OpenSslPath, OpenSslCommand) + if ' ' in OpenSslCommand: + OpenSslCommand =3D '"' + OpenSslCommand + '"' except: pass =20 # # Verify that Open SSL command is available --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel