From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7122067840244383744 X-Received: by 2002:a05:622a:1794:b0:317:db58:f413 with SMTP id s20-20020a05622a179400b00317db58f413mr24340399qtk.505.1658235639573; Tue, 19 Jul 2022 06:00:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ae9:c206:0:b0:6b5:78f8:191f with SMTP id j6-20020ae9c206000000b006b578f8191fls18015qkg.10.-pod-prod-gmail; Tue, 19 Jul 2022 06:00:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vq1vgHLjSss5d1FWfHR02RFOW1kKUAqpDqKcYFTFhn3KWWM2Di7055y5FZMRJZ6354amat X-Received: by 2002:a05:620a:e1d:b0:6af:33de:ed35 with SMTP id y29-20020a05620a0e1d00b006af33deed35mr20592252qkm.270.1658235638721; Tue, 19 Jul 2022 06:00:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658235638; cv=none; d=google.com; s=arc-20160816; b=aH38p+97Zh3JnoqWzMbKnFNysKFzRnkntOpLoMHYBVSQrn9b4TZ2Ry/mWcR2f8r56O 6CoCfdfI4YWoVvHLQbyM22s4vxH26t0KY56Ezpd1AMj7nbQKO2d2lC6K7MotvHin5siG 2bFJl75WXI0sZ/txQ5XfnZtraz3qnE0EEZOkvvUV1zs3gN5kB0iWkUl/RJWVuBbTxl/k yYf79ViUOmaFlLYTVUv2M82qcwGe69vPuol9PIBEkGV9hto6BobloCq7qOzt7WBhRmLj 7EUVzZStTOTAs4O2aYf0IwlSRqUTFZnp2TirErMNf8ScPEV+b2jVI6fbMj2jAcci04/2 jBpA== 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=GdghwpLg3fypssDohhmEq5Qz7tRHYUJyXMtwtXu5Bp8=; b=S5vffy26WVn7Vq0Wq5C3yz3917pPfHqtrLnnrfTgir4EeJtmpo2tjSjfcOIPTM2E6v hmfTkoExDMS8gIoNKBt++oImgcugYvYhs9dw9s3ip5rBfhvbOYejBPitPdZSkcPr8TP7 cGKSrxI7dbY1L1QgiGy/Xz207ebvtema5FqjOah0aapk24xWuANMak7gYMX74S1Bt+NI 0Nz1sfOYWzV3VnoKDMJemWP1kdspnn5nUVZG39aBdXNvg7kwMQzpIpdWODM1GP+70Kr6 zxmTBDfmDLY0QKxAsesvJFQ9pfSBFZI38iVvcmiqoO5WrtO1woo32JcY+Et4FSGqZaNr jKLg== 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 d3-20020ac84e23000000b0031ef84cbf53si138024qtw.3.2022.07.19.06.00.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jul 2022 06:00:38 -0700 (PDT) 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 localhost.localdomain (mm-181-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.181] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26JD07Mf015247 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Jul 2022 15:00:36 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 20/20] Revert "utils/ply: Change md5 usages to work on FIPS enabled hosts" Date: Tue, 19 Jul 2022 16:00:00 +0300 Message-Id: <20220719130000.15943-21-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719130000.15943-1-amikan@ilbers.de> References: <20220719130000.15943-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: f7oLIAI+MyVt 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 d11da97..e605155 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -541,7 +541,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 767c4e4..46e7dc9 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