From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7294931408004317184 X-Received: by 2002:a05:6512:1103:b0:504:2345:1b23 with SMTP id l3-20020a056512110300b0050423451b23mr2820151lfg.34.1698483575996; Sat, 28 Oct 2023 01:59:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3086:b0:507:b8d5:d6d3 with SMTP id z6-20020a056512308600b00507b8d5d6d3ls320572lfd.0.-pod-prod-09-eu; Sat, 28 Oct 2023 01:59:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbpIsatQfFfii2ZbHT7VnKkKjNuzVpGR5eOR4G0npNiQ9ObYIPl6zOgXeq7QQ1UmWoHlZo X-Received: by 2002:a19:e043:0:b0:508:136d:ab0c with SMTP id g3-20020a19e043000000b00508136dab0cmr2931355lfj.30.1698483573553; Sat, 28 Oct 2023 01:59:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698483573; cv=pass; d=google.com; s=arc-20160816; b=I5ZLeLluuveXQg9JU79O7DENT5a3QS6SoVI05sjH5Hmu+hF5+0qOlIoTfKwmDInmF6 BlqpVbvg28vWp5weZJSeWSMW46/Aj3DUcVG7DfABF5ErU2JxNFxlU4SB8i8RyCj3pkhW ZDhZg7Q12fUQCovtj9kpmORwSMSfOF6peOzAcgHMo0uAvS70ABmhc/0BW8EWcRdQw6T8 HLl18aoHCkG3iokOpuG7F35obupqWAhOhPKNguoj6SMPzExKJAnbJC2G1xsDeE5leyWL RWFVpL1AHAVpndaxG1slcbHp4i276OscuF8X1m2LlH1muURpPTFh/UoAO6j0SnQOqHpP WF7w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:to:content-language:subject :from:user-agent:date:message-id:dkim-signature; bh=WHkYsq6vJ6zIGctpzuEZ2Q9U4jqAxHf+r0QMiY0KtJc=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=YOe9jpyUt5ie8rtnBhDAfwz69SEvKbwzVCDA4abImMm/+h/QByKdA9jWyrL+/RPaJp rIV9/kGLlzWyV3jUmZ9nOWNtlIEh3qyP9WZqUUuoEN6dNu5xWnPt0ygFS+AAKNcjuvPx 2F/4an4P/PqPTSrbm0Ae7PeUCr78o7bKGpbaqM+yrHepGaCT3xszHjBXj8JP75UjgIqs mLi5l0yRQRIg9Ofb3CbWl7yaZQwyKeS82Duv+i/RUk+YakFv/2W6DLFnVWJrRJKJiNc3 zedxGGwvJoit+SzZZKfK9Q/YEXYPgBvHecLNCvP3hX/zpR3YRMRoMZd8eI2di/DpPQVF eVaA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Q1bNllnB; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1b::627 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20627.outbound.protection.outlook.com. [2a01:111:f400:7e1b::627]) by gmr-mx.google.com with ESMTPS id c31-20020a056512239f00b004ffa201cad8si195026lfv.9.2023.10.28.01.59.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Oct 2023 01:59:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1b::627 as permitted sender) client-ip=2a01:111:f400:7e1b::627; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Q1bNllnB; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1b::627 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GWqtMIBzgMXxzwTmc3AjjiTUUM8C4aSpUrqonWLnCQHmHzphmMuQJNnTpJrnZXDQ30pPS+KRuVSVFsB0evGjiG5SjELZCkcNcfEN3BtgEfqtCjahEEt/lDbXtUZOg6mDGdaq8Pc2it0eJkqZtsQVZ8FV+B7WwUKSs9CW3dSXOaq+jp5RQdEoWnRnk7mqqaGEg28XtcbX7HAg1sqy0HyDvP4F98gmIrXJk3JU517AzoyfeE2xMqtoMojQWr+eHTYpkRkUPaEzHfJE6NxG9Xy5W1GvmQv/H+TmtmtHrSMSAu8gw+Qln8MUveRwHPk5Uh7cqri2/2MgLFNk6Dj7OslgDg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WHkYsq6vJ6zIGctpzuEZ2Q9U4jqAxHf+r0QMiY0KtJc=; b=OYQLPsN8N+3z2EqgYqbeg/dspO9LqfdP+YJTAgzYgZbYeQa/QRmxXr5bxdHzi0Y1DYxxP1hPFIGOZimafgejJLtZBlzAfhxEHuJWZtD/LypZS6ZqDxrFyEH4wXUtuZg4X2uWcP59KqCY0P8FJQYbAYHNK6r9uYmzng4sAFcD9WiNlis+POazAvlCVMkfqaZXv+VS30qc7Qy+URl2ngAl475rj7dDEMSfpW2pKXzceaWFwShJb/9uI3SHMm/uunqKApjrSIZ12tQdiQ7Ux0k8soSz/9un8/DijkMFXgmOWdIsji1sFlh6gX948lJvPJ/ReXyQnyq06BfHMO2Eu5cFdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WHkYsq6vJ6zIGctpzuEZ2Q9U4jqAxHf+r0QMiY0KtJc=; b=Q1bNllnBrxQVP8QoC2JQ/kzX7SxwQe+KuhZ4nz+m5zXX9l6UMrnWSh/bYCVvYHGmziNRYPImBf5bzgUawK26KTBhD5gR6n0f4cRM9aTq/CKhswrpqjvl3s4I56Z1nGJ8rHljMXwLrvEiKSpVb0vTV3FZ0nv2H4WqfgfLf0A673nhkqTPCVyrRdR0vEQUq4PjmoDt6pAws3d0frptg9vUwDj4xWYdzI+L94geAgbiMqiSb2zRw9JQFHBQuNvmYpbATvAW/hSJxNzV/c3z+9qjUeM/a+VDv8N2kp4PVO0ZB9cmQnn8pTSUOiooK9Fo8yoLkEUPOQuXhZMYv2smoaUN+w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS2PR10MB6426.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:545::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.20; Sat, 28 Oct 2023 08:59:32 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::ce06:5d24:9896:669c]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::ce06:5d24:9896:669c%6]) with mapi id 15.20.6907.032; Sat, 28 Oct 2023 08:59:32 +0000 Message-ID: Date: Sat, 28 Oct 2023 10:59:30 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH] image-account-extension: Avoid deprecated crypt module Content-Language: en-US To: isar-users Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::11) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS2PR10MB6426:EE_ X-MS-Office365-Filtering-Correlation-Id: 39771761-3b09-47df-2e29-08dbd7943357 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0RCToUPl0R668mzusNJhzfP32G12gA8TNCjayQvFZaZFdTeZ1IS0sIWgPwLJzu4wQIUGqIY0hFAOs/hK0dp2ncB32xtps0VXSY6ivXUvUgu4YTi/0eFCmFpkS6Xv4fmZsy3ytZ/wc2FMcgM2J4+26KLRo1B+eyEB4RNCuR53nrVMIxlBjux3CabSCKfQs56SbgmEL313/h0Xj2RwOj5rOQlMGKkvusb+MtDVqSu2X4Z5IIqRKqKUen0TVBwe5uPIQ/rkQ99+whLDhXKw97rDJYP4SslvuQD5FTdXDVYVetFQnvOTy9roFSvy0gnqSMkN0ZgamzwlU/NtfkFS5qUxYRnzY7S7Wdbayhmw0mjrPvwb87kNkalACws+jAdR+8uqLjPDKrZq32r/5rIUfBwRBhHnvNxPQjCaYfsk1HrpGydgfhVvuLjjGhwc6TtuvoZJ6vdUzXJiaok7u119GjKoS53+6glU7b14dUWap3USJp3avT7kta/U35VjHNvvl59ITNpfIHvm37JLSqDCDXc92/0APxtbbQzgbcS9MU9du1QGI3X2Ha7lgvDAYAl2V44liex3TCcTZdGuYeXL2X0ZIKh5/Jf9Zgm2eEeABnF7mZNSLYAUoWnhfMqQa2VxEyHeXPUHXXgXFUvI/UM5UFKVLQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(39860400002)(396003)(346002)(366004)(230922051799003)(64100799003)(186009)(451199024)(1800799009)(2906002)(41300700001)(31696002)(44832011)(83380400001)(15650500001)(8676002)(478600001)(6486002)(8936002)(66556008)(66946007)(66476007)(316002)(5660300002)(31686004)(86362001)(6916009)(82960400001)(38100700002)(2616005)(6506007)(26005)(36756003)(6512007)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TWlmYXhFQ093Znl6alVMV05SczA4SmpKZ0dBSkdHeEhIQytsVW5XdDhvOGpC?= =?utf-8?B?K2t6aUZ6K3FsM1hGQ204SStSQVo4M2QrM0RRbXRXQkxiNit5SUl6M1hpMk9E?= =?utf-8?B?R3d4eXJRS2VFM3F6enJVRTZLWWtVNHU1MzRhK3FiNGZnYm5jb0NLcTN3RWpV?= =?utf-8?B?MWhJNkd0bHU2UysvVGplTUFRU2ZBTFFCeU4zSFpTYlNBemJUdTFxRHpwS2Vp?= =?utf-8?B?MDkxeDNKYStuZ0syR29GQ291NWs4R1Z6RzM3c1JxdGF0enBQQjB2cllkdlFB?= =?utf-8?B?MjM4Q0JxaTR4V2k3ZGNJdFpkZUkwZmhrT0cvcTYzVmtrUWFpQUxVd0Y2aGJo?= =?utf-8?B?eEl1MTBTYWZBdDlQMEl2K3BDU2pmUjBwU0wyVmxkdURuYWxxNGIxVnRxODFL?= =?utf-8?B?Z3p1OFB5WVJ0NFRIVlplSDdjTWNFTHp6M2lrZ1kyRVJuOTNUeEhiYmFvMkdE?= =?utf-8?B?dldmbTRoaHhscXNSVmhPVDR5QjZjVXQ0bklxNUJEcTZFU2FHUkFLcGtIT1BO?= =?utf-8?B?KzZNODM2d0ZoQVhmZmxJV1c2QXo5TkRGSFQ2MzY2bTRQQmVzOUhBdzhIcWhs?= =?utf-8?B?T2hKTnpnS2ZnSG5adnl2amt0VlNpZ0hYdnN0VVo5SVhpSVF6TnN0L3pVOUtL?= =?utf-8?B?emtRaVNEUDk3VzlyaWIyRnZMdHBOVXJOLzFHOEl4YXlxZ29NNm9KRTNzRUE2?= =?utf-8?B?Skt2TUxaS21hRnZKbndxc0Z6R0VWVEZqK3I4Ty9YVjgweURnc1BsTE9INjA0?= =?utf-8?B?MUxHMTVWT0ErdkxXWk40aFYzeS9UNG5FdTZKaHpjVjhvWXNoTXpDcndHZG9p?= =?utf-8?B?akRPbnlWNEs4S011M2xtNDRyS3RUMGFEL29HUG1ZVWp5ZlppNlNFcjl2aHdr?= =?utf-8?B?RUFlQis3bCt0RVVtOGpoaFB5bXVwOUUwVUF5bWlHRFNPOThDSWd4eFFRNTk1?= =?utf-8?B?cGN0dklEZXdwWEd4aU85d28yVkNDNGg5QnB1SWJaQVJLSmNrUVVrZUlzMTF2?= =?utf-8?B?dGdBekJrQXhxRGhJVVljVzJid2Q0TkRCeXB0T09RUXYyc3ZLdkp6TmZyc3lx?= =?utf-8?B?VVdNTXVVbnIzSDhBZU5Pdy95aDRrQk9xdEdtWVlHQVZHQ0RUVW9xTm01UEJ0?= =?utf-8?B?dWRqYWpTNTZpSzVNckFiNlhkMmovTWVNZ21Cak5nU0hiZHJENDRiQWcrb294?= =?utf-8?B?WG5SRjArQzQyT0ZKYVUzUVowWEpOY29YRjcrY3JLK3J1TEpwWHQxODFKc21N?= =?utf-8?B?eS9FbzdnWnpxQk1EOHI3M3JWU202cHZoN256SWNTaDFHcjMxOWJqUkhFb1E4?= =?utf-8?B?U1o3bUc1VUU2REN0TW85RkZQRG9OTUpZT25WcU9wSlFEc1VvMTRjWjJ0U1cw?= =?utf-8?B?VlR1UXJkdlZBSUpSYTBCdUZ6bERrTFh4TzhSYkpjUlZNdW1BWjlQNUlUN3Ja?= =?utf-8?B?WWtjek5sRzFqSWMzbXBOTG9pWjI0MHdvNFVZMlF2OXdJZnhOd25XTjR4bzBH?= =?utf-8?B?cmZobzQ1MTZIc2hXczM3blN5UkllLzRCTVdNajluZXFjUGJxVWh1VnhUc3Mw?= =?utf-8?B?cGw1NW9JWktiQU4vbTBpOGZUNXp5anpyL3RkY3pRM1dPNlRrZ040TDUrR1JK?= =?utf-8?B?NEUzWUZlZnRBbE1sdk5VbU5nOEt4dlViaE9zYUtUZXFSb2lzaFhuZW1yd1dk?= =?utf-8?B?eGNkZVRBOWcwYVZoUUZVMFdGd2V4RCtzb0lrSVV6VHlQK2RsQzdvWjcyOVl6?= =?utf-8?B?REZGSU1rRXdIekxNaysrSUplVFJxK0RZNmJzZ3N5dU9nbldmWjF4Y1JWQUJU?= =?utf-8?B?WE56UVgxSWVoN05EOXJPOEVLNEFhRFRmRDVVOS9pZVlFdU14a1BacFpHQ1pS?= =?utf-8?B?b0dUbXlLK1lSeVY2RVlHay9mUnBoVHdUTm5sOVJZSmJRNUVZdmJmMHpRUEVJ?= =?utf-8?B?UzRLL1liU2llTHdXZmM5WTAwZVhGM01iQUtDVFlOK3BwVnh0cHVlc2lBa1FS?= =?utf-8?B?eTUvczUrTy95YUdzR204K2tGdmIvbE11c1pUL0dGVUJITU1mQi9UNExyT3lh?= =?utf-8?B?Y0JaRDRxK2FHMmFkODhWN0JtTGZnM2JJdzZxV25zTWtFdWxJVmN4R09kaFJG?= =?utf-8?B?NnRrTENOSG4vb3dxZmRsUzV1REttT3VlVE4yaWJrVElaQnZlbzVyV2JYeDhG?= =?utf-8?B?anc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39771761-3b09-47df-2e29-08dbd7943357 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 08:59:32.1647 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +6ojd/vdcWZ1t7sJk6XcolK66FoQWcDpH4uEYDXB5zDHbrOwYru7wOak94k7r8hjf0DX9Wo8G+B4cpaa0z590g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6426 X-TUID: EKhrygIORsTx From: Jan Kiszka crypt will be dropped from Python 13. Switch to 'openssl passwd' to avoid extra dependencies like python3-passlib. Signed-off-by: Jan Kiszka --- meta/classes/image-account-extension.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass index 6f67f459..412aa06d 100644 --- a/meta/classes/image-account-extension.bbclass +++ b/meta/classes/image-account-extension.bbclass @@ -72,7 +72,6 @@ def image_create_users(d: "DataSmart") -> None: None """ import hashlib - import crypt entries = (d.getVar("USERS") or "").split() rootfsdir = d.getVar("ROOTFSDIR") @@ -137,7 +136,7 @@ def image_create_users(d: "DataSmart") -> None: if source_date_epoch: command.append("-e") salt = hashlib.sha256("{}\n".format(source_date_epoch).encode()).hexdigest()[0:15] - password = crypt.crypt(password, "$6${}".format(salt)) + password = bb.process.run('openssl passwd -6 --salt {} {}'.format(salt, password))[0].strip() else: command.append("-e") -- 2.35.3