From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:ab0:6656:0:b0:419:3757:93f with SMTP id b22-20020ab06656000000b004193757093fmr9316663uaq.80.1669991859464; Fri, 02 Dec 2022 06:37:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a67:d297:0:b0:3b0:6d1f:6a5 with SMTP id z23-20020a67d297000000b003b06d1f06a5ls1194879vsi.10.-pod-prod-gmail; Fri, 02 Dec 2022 06:37:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Z8f9LsDYK2Z3JiuCXLOfcXc5ibgCX6RQGSikzzBQZ64LZ5YcejQ8A+U/jURXzZ6BMcYEw X-Received: by 2002:a05:6102:34ee:b0:3aa:18c2:9a51 with SMTP id bi14-20020a05610234ee00b003aa18c29a51mr31962721vsb.46.1669991858799; Fri, 02 Dec 2022 06:37:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669991858; cv=none; d=google.com; s=arc-20160816; b=suYTtnXcGZtP5pXyHT2xHglCStl63Efg0LJFKAF6ACmRbVFZ39Zc9eIjeHWzLgm22I LhQLdADZ4uxMwGd0bsvHcUpyMdpj/Sxndng4PScPV6WFFcgMTRgq6HwykEx1mr0cu+1y 2dESgDr7H+3rLgkM1zZl4dX/hKlDaVXdV9lFeW2U9RioBSyagGRW1kR2YSxK1KzKJRZY ihJvwLtCf2ELgoFDlYAdeaEIDK7SbSRNOeL6tTM1AJUBtmuOh3UucJDNcFEq/8EcXfH1 ds33kx70ibdANaNIycDqCf95xE62wdQXI5hPnZn0hNHL5q5Rmbh+XGZ1siAbEXVu0JGP qITA== 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=jmGt0U35vZAqZvGPctCSHWRijR7RfWJkRLSoQ/qDHALhGeUhN/gWzoIOP8rAWQ93eA HZWIRXKqbsRnfnOtIYHJLkpo8xXK7IBafv3d8MIKJD7pcjpTtkYaSTPW15Sq5cK6jdCG 98afxvTs9OMfbgnTokMemmXoFUnqsSWyCL3vlqQ4SgFhWqYkddRXlzymSOnVjmq97qRt lflyq+ntGNlsnhUskxPRjEnQpl5kuU7rW8OA990BX96ulaLZErU/joPGKHcmxCjxetxK kwsWhBA0yngBHpFETdE6comF87M7FYbPUvnkopwNaZw5ddms2tndJ52G/AN+N3aujqUN +Sow== 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 u69-20020a1f2e48000000b003b803083c23si402870vku.0.2022.12.02.06.37.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Dec 2022 06:37:38 -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 (mm-69-83-214-37.mgts.dynamic.pppoe.byfly.by [37.214.83.69] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2B2Eb8Ei015256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:37:35 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 21/21] Revert "utils/ply: Change md5 usages to work on FIPS enabled hosts" Date: Fri, 2 Dec 2022 17:37:01 +0300 Message-Id: <20221202143701.6665-22-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221202143701.6665-1-amikan@ilbers.de> References: <20221202143701.6665-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: mFq3H3EYY6Hf 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