From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128378901610364928 X-Received: by 2002:a9d:178e:0:b0:618:edd7:3878 with SMTP id j14-20020a9d178e000000b00618edd73878mr2477259otj.229.1659705090009; Fri, 05 Aug 2022 06:11:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:646:0:b0:335:3a6d:57e6 with SMTP id 67-20020aca0646000000b003353a6d57e6ls1544577oig.6.-pod-prod-gmail; Fri, 05 Aug 2022 06:11:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR5AszXVaQewJv9mgOjbRptUSz61zuZFLysPsTmOdQtM1mlD5bfF6kIEaZygGjtK0Lp/L2SH X-Received: by 2002:a05:6808:308b:b0:33a:7307:b703 with SMTP id bl11-20020a056808308b00b0033a7307b703mr3119625oib.263.1659705089515; Fri, 05 Aug 2022 06:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659705089; cv=none; d=google.com; s=arc-20160816; b=oVefr6FYusdQqo8T6RF3n/S8PxuKUGnjGcGBKZ+gUWe18o1AaOJB/Xc98rGlLF5+hq 2/Q3YI9Uw/a9q1I+Pu2qDG+FRVbZ9WIJBUqrJKPIHDNTgtiw6ht2CSK0SEYitBuVCHjg d1AmXhV/GzmR0ik29M4WdNV+WuRSS4GtyGwcl1ELagKG2IofBVhw9oB4XRrxyJgzAGaC VEIPHnvtY2kyKaV58qJzvvBpc+qIWEwLiloS/x4bpZ/6HkhHbGKpOf4XrZZHIFiiABmH hDu7JLDN2KoIn53zE/YhBGq5mpRD/5r/4dmFCHgijNwP87w6h5wyZcYAp7fKAcdRAhx3 71QQ== 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=ML93i4e+o3sZ2bCZwqhAYp/lXUsrXdjxKfYDiavwjNH0QxmG3N4j1PbzG27quyVab8 8C+12CvLTAL+RjKlfhpa8X78KXv+se32nSdAe5LHubd6j6SFNIJjpPps2JpkyTBdcIGO Nf8CNG8QIcfSBkK5YnKsTgMC3MzgoRq8vL1Ohkd4L2qSi+alZJSL+8zuzAMjkKjWNsGE ANBBAPmdARkSNZoYxtz92rvK39YYgTJo3QLiEV/5SRdR5HgI9Us3oH2Mv/LyrMgM22Xs WdYh0v6/UTy8/DYJ4TcX8OLvFjd/JJiqoPUM5kc6CJekzhSKUlNTeLEosSqsbhqQyh8l dshg== 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 h4-20020a056870170400b00110b77f4e1csi374474oae.0.2022.08.05.06.11.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Aug 2022 06:11:29 -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 alena-nb.promwad.com (mm-183-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 275DAhI6009685 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Aug 2022 15:11:27 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 20/21] Revert "utils/ply: Change md5 usages to work on FIPS enabled hosts" Date: Fri, 5 Aug 2022 16:10:34 +0300 Message-Id: <20220805131035.22844-21-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220805131035.22844-1-amikan@ilbers.de> References: <20220805131035.22844-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: zsVVVBEPKhDV 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