From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:a05:6870:2c94:b0:143:74c2:f928 with SMTP id oh20-20020a0568702c9400b0014374c2f928mr261007oab.64.1670936086805; Tue, 13 Dec 2022 04:54:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:b797:b0:144:d97:cccb with SMTP id ed23-20020a056870b79700b001440d97cccbls5379342oab.1.-pod-prod-gmail; Tue, 13 Dec 2022 04:54:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf5eRAuSITiIt2nmJZFYgiCNh6dEUJpr4nzAbSemKWvMlPKCIURCDmqAEGJ0Jg6XveoMw5Sv X-Received: by 2002:a05:6870:9f13:b0:143:91f5:65b2 with SMTP id xl19-20020a0568709f1300b0014391f565b2mr9250756oab.52.1670936086277; Tue, 13 Dec 2022 04:54:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670936086; cv=none; d=google.com; s=arc-20160816; b=VcKHe7mIZjsZ5IeWAY5DwzgvZ/UjCWXv420ZemKSsh8DfvfCKfNW0CuMzRrWGCCETQ R7gyLoYw5Z4nwb8EvlFTGCUqZkj3wtVczLixriNllU819K0RmYSVDgdPvBTExcm/U1lY oEkHaUcVMUO1TRLqbWu9fasSvkJ+hPsT5+WYdiE1IM+9M/w6slyokPDu7svb0o7c6jJM Lggc0HYKLa6klsmN1Y3mFhr0nSlpjV/lJjnEeEGtC05gAlc0p+8MMB1MkJIZZDPjci6b Lp5Cjf4Gg3C4YKKCXQX65Nj8F9VcMdZXO/wKHocNbzoP+0kMLgWG1Fys8KhKArRKHLrh ZHqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=kI1tvGiY5vAW0ONu6N7uTeEieQUywrxCRyoZbiTOabk=; b=M1HWrJJuJsvTVVrml5DpKbG4mJJFHvMCA6W4SEpluATGNOtampTjnTAvZNSYqU7jut BF7DQiU4HKYWv5RtRC8hfbaK6iHiNyh3VsBcQnWh+7o36i6eMiJGF1nQgxZXXvDtA0xU 2WSBi2po3Z0CvL3XFyAuWxC7axgZ0JLtegzY9W8Queax6lb78X9L9VCp2ewwL/1nRyQx fdO8pjFwzgD8Gl1yJZRYdCLZ90gD9R1v23eiJ1Fp0Gx+9Ck9BTCH+Q2AgXpm1KZWVhxQ a7Q/tnfR3iGWWnDUh+Vd9XCnueyCTRbFntqbFd+SVFFL5KxsDrCUFPc4JoH6ZAh17UN5 mRhQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ep2-20020a056870a98200b00143cfb377b2si377532oab.2.2022.12.13.04.54.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:54:46 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from alena-nb.promwad.com ([194.49.52.147]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BDCrDun001200 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 13:54:28 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 21/21] Revert "utils/ply: Change md5 usages to work on FIPS enabled hosts" Date: Tue, 13 Dec 2022 15:53:05 +0300 Message-Id: <20221213125305.10984-22-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221213125305.10984-1-amikan@ilbers.de> References: <20221213125305.10984-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: uPXvQurczPW2 To make stretch targets be able to use WIC we should not use Python 3.6 functionality. The flag usedforsecurity of hashlib constructor is not exists in Python 3.5, so revert its usage. This reverts commit af866dd077867cba0129757bfcc689551445e9d7. Signed-off-by: Anton Mikanovich --- bitbake/lib/bb/utils.py | 2 +- bitbake/lib/ply/yacc.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 92d44c52..e54ebbad 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -545,7 +545,7 @@ def md5_file(filename): Return the hex string representation of the MD5 checksum of filename. """ import hashlib - return _hasher(hashlib.new('MD5', usedforsecurity=False), filename) + return _hasher(hashlib.md5(), filename) def sha256_file(filename): """ diff --git a/bitbake/lib/ply/yacc.py b/bitbake/lib/ply/yacc.py index 767c4e46..46e7dc96 100644 --- a/bitbake/lib/ply/yacc.py +++ b/bitbake/lib/ply/yacc.py @@ -2797,8 +2797,11 @@ class ParserReflect(object): # Compute a signature over the grammar def signature(self): try: - import hashlib - sig = hashlib.new('MD5', usedforsecurity=False) + from hashlib import md5 + except ImportError: + from md5 import md5 + try: + sig = md5() if self.start: sig.update(self.start.encode('latin-1')) if self.prec: -- 2.17.1