From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.92.21.12]) by mx.groups.io with SMTP id smtpd.web11.23850.1585346185068883042 for ; Fri, 27 Mar 2020 14:56:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=GATfNl6l; spf=pass (domain: outlook.com, ip: 40.92.21.12, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CzFEpNlMxsZRDQdwiuGucH5T8Xu1HR0dbCqOLd2t9DSqr1XVH816+Fobuh1gfprvwLurbuS/ggDi0r/FEn/H3BhqXzU2pWqIIvwqSuP0zj7LLGkhhttL3nu5kUe51MutPxTUouYmX6PcwoNzf3KKRds5yGr3Bxo9kuRuvXTCmj6NETXlX/8Vq2zWJ2j2FHlFW0vooflDOIp14A3F87GnIEudiRL3H2+qK6xaQ+bgqiQDOI8ZqAlFUT2cjwuxOiN/uaItvZfyTupiTmpeeaUEjsUJ+UzZi+RhOgYnWlSmeIffL2ybxNrT6XEA9hn3YgswrMuLI0pVsCam2RG78vVHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qC3ZFBIQ2EPlRgjcwK/1gzWN9ORhLHBVrdhqcwfArN4=; b=H58zeXIeBfNRQ3XSjeJdsBvBSKtqjUAmFaXwiTlia9N+f6k/Uu4WAZ2VPc7Qsp8olYLPDjL2UB9nkFVxcQ6qYs74faEcw6xNd9uGUdjVVhHMRxmXDjd1nY4QTbSPct+Vr0j4/aGT0aglRp9v9vZnOvDmeMTD+hoga6KoeOnLDY86vVxbTXaCbX1LsU8OjjzMwYtede6TTXxjaqQ0HZkTPu65nEDZkqnPpM7YCdD8Veu4gtJYqDzaIz7bYmIgkT1icnFfpZa6R7qXuPuGAMCGNaWccAu+HPTiur4X3cO3vkHwhUmHKdavNRlguoqnq+Ce6LCqgukKjy4QIpPJSscOSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=outlook.com; dmarc=pass action=none header.from=outlook.com; dkim=pass header.d=outlook.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qC3ZFBIQ2EPlRgjcwK/1gzWN9ORhLHBVrdhqcwfArN4=; b=GATfNl6lzTCaaVxZJrlM9txZPQOfAmXldZKGh8RxycSc6VGm/XpojeJTBCzCDciJjb8NvaHJnB5p5Eixj+2bEjtDs2feTRMXTCIRACFJ0FlXfo0USOCJYPa3EFKibMkafYyeUqvZzDzkeCt8/VjmQuEGFulwydW8ehdmkNGwj+IHKu3jPt3/DMJ/ioz+ZvChBOQGdSOOvIYxCOTp/ow5FdNIy20KsAysrjkMDjxxgFZwAuTGkggXCVlKsFatkAuOcNRMRMg8ZpMJTdVwJYgyUDc+e9meJgEtTwGOuvx/GfkVUVLOsNgpSF8AezzJJixClpBMzvrb2yBZJhPClVCl9A== Received: from DM6NAM12FT037.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::44) by DM6NAM12HT113.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.9; Fri, 27 Mar 2020 21:56:24 +0000 Received: from MWHPR07MB3440.namprd07.prod.outlook.com (10.13.178.52) by DM6NAM12FT037.mail.protection.outlook.com (10.13.179.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.9 via Frontend Transport; Fri, 27 Mar 2020 21:56:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:277CE5176526466A36052369C43008CBF12D11991BD54B26007579C57EB85DD4;UpperCasedChecksum:01603EB6AB1C7BB7F9037A35A09DE1A6CDC18E77772C36E515B5C994FEADB992;SizeAsReceived:7836;Count:49 Received: from MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::f5a7:e51b:e22a:959f]) by MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::f5a7:e51b:e22a:959f%7]) with mapi id 15.20.2835.023; Fri, 27 Mar 2020 21:56:23 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Laszlo Ersek , Siyuan Fu , Maciej Rabeda , Jiaxin Wu Subject: [PATCH v3 3/3] Revert "NetworkPkg/TlsAuthConfigDxe: fix TlsCaCertificate attributes retrieval" Date: Fri, 27 Mar 2020 14:55:36 -0700 Message-ID: X-Mailer: git-send-email 2.16.3.windows.1 In-Reply-To: <20200327215536.9556-1-michael.kubacki@outlook.com> References: <20200327215536.9556-1-michael.kubacki@outlook.com> X-ClientProxiedBy: MWHPR20CA0037.namprd20.prod.outlook.com (2603:10b6:300:ed::23) To MWHPR07MB3440.namprd07.prod.outlook.com (2603:10b6:301:69::28) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200327215536.9556-4-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:a:5a12:4b01:47a7:5411) by MWHPR20CA0037.namprd20.prod.outlook.com (2603:10b6:300:ed::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.19 via Frontend Transport; Fri, 27 Mar 2020 21:56:23 +0000 X-Mailer: git-send-email 2.16.3.windows.1 X-Microsoft-Original-Message-ID: <20200327215536.9556-4-michael.kubacki@outlook.com> X-TMN: [dBzHYeg7pzssq9WORYdn3Qps+MVHcnb05DQ8oxc/bcv+JX8wpHfHa89uvDa5O0mE] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9cc4f04d-7987-4587-a0cc-08d7d299b0f6 X-MS-TrafficTypeDiagnostic: DM6NAM12HT113: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CwhXGuHcY4t4cOaWIJNyUfGCCbWT7TRVu1l6PIZyRHlie/uQf29q9xhaDDrwtZ6mX6Ziiwwebks3oO16oUrO6mboVZGyXVVKWEN5MRcNApg28LMhnv0b6tkjM8Ne8tFKWI7TIjZFjthDZEctxlNVGLP82WSPFDAzJSm+Ma6h5MIFAf9bLshXyrI6KK8XJgeEpJMF6k4EzDxSB6HUqKFSBBBKPFPYO901z46FLu9R360= X-MS-Exchange-AntiSpam-MessageData: upVikWZsKnQiSpRnhPUFud7zr9GBFh2seqKeDGOIuSmh2IJiD/WvxTesTs0iiU3POwYg+IuiSxD7NZKNQt6NlPa8/HDv+XRzOMX4wLSRCFHbkw2ES6l8tcSCFreFWLVipAkZjBJE8HvNeq9QDomgNsNiT6e8HvnXQBXBTZ7gxaBf1CYzfuoTTDMa8SZmH8B4wjuJOBCRKHUfMKN0SqqKQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cc4f04d-7987-4587-a0cc-08d7d299b0f6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2020 21:56:23.8226 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6NAM12HT113 Content-Type: text/plain From: Michael Kubacki This reverts commit 6896efdec2709e530b23c688cf0f31706709a0c5. REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2062 GetVariable() now returns attributes when it fails with EFI_BUFFER_TOO_SMALL. Therefore, commit 6896efdec270 is reverted since it is no longer relevant. Cc: Laszlo Ersek Cc: Siyuan Fu Cc: Maciej Rabeda Cc: Jiaxin Wu Signed-off-by: Michael Kubacki Reviewed-by: Bret Barkelew Reviewed-by: Laszlo Ersek --- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c | 27 +------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c index 715bc3a0a941..2481d1098fa3 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c @@ -657,7 +657,6 @@ EnrollX509toVariable ( EFI_SIGNATURE_LIST *CACert; EFI_SIGNATURE_DATA *CACertData; VOID *Data; - VOID *CurrentData; UINTN DataSize; UINTN SigDataSize; UINT32 Attr; @@ -669,7 +668,6 @@ EnrollX509toVariable ( CACert = NULL; CACertData = NULL; Data = NULL; - CurrentData = NULL; Attr = 0; Status = ReadFileContent ( @@ -712,30 +710,11 @@ EnrollX509toVariable ( Status = gRT->GetVariable( VariableName, &gEfiTlsCaCertificateGuid, - NULL, + &Attr, &DataSize, NULL ); if (Status == EFI_BUFFER_TOO_SMALL) { - // - // Per spec, we have to fetch the variable's contents, even though we're - // only interested in the variable's attributes. - // - CurrentData = AllocatePool (DataSize); - if (CurrentData == NULL) { - Status = EFI_OUT_OF_RESOURCES; - goto ON_EXIT; - } - Status = gRT->GetVariable( - VariableName, - &gEfiTlsCaCertificateGuid, - &Attr, - &DataSize, - CurrentData - ); - if (EFI_ERROR (Status)) { - goto ON_EXIT; - } Attr |= EFI_VARIABLE_APPEND_WRITE; } else if (Status == EFI_NOT_FOUND) { Attr = TLS_AUTH_CONFIG_VAR_BASE_ATTR; @@ -766,10 +745,6 @@ ON_EXIT: FreePool (Data); } - if (CurrentData != NULL) { - FreePool (CurrentData); - } - if (X509Data != NULL) { FreePool (X509Data); } -- 2.16.3.windows.1