From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
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 [thread overview]
Message-ID: <20220719130000.15943-21-amikan@ilbers.de> (raw)
In-Reply-To: <20220719130000.15943-1-amikan@ilbers.de>
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 <amikan@ilbers.de>
---
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
prev parent reply other threads:[~2022-07-19 13:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 12:59 [PATCH v3 00/20] Migrate to Bitbake 2.0 Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 01/20] meta: change deprecated parse calls Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 02/20] scripts/contrib: Add override conversion script Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 03/20] scripts/contrib: configure " Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 04/20] meta-isar: set default branch names Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 05/20] meta: remove non recommended syntax Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 06/20] bitbake: Update to Bitbake 2.0.1 Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 07/20] doc: require zstd tool Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 08/20] meta: update bitbake variables Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 09/20] bitbake.conf: align hash vars with openembedded Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 10/20] meta: mark network and sudo tasks Anton Mikanovich
2022-07-20 5:40 ` Schmidt, Adriaan
2022-07-20 5:47 ` Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 11/20] meta: update overrides syntax Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 12/20] sstate: update bbclass Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 13/20] bitbake.conf: declare default XZ and ZSTD options Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 14/20] Revert "devshell: Use different termination test to avoid warnings" Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 15/20] meta: align with OE-core libraries update Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 16/20] Revert "Revert "devshell: Use different termination test to avoid warnings"" Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 17/20] CI: Adopt tests to syntax change Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 18/20] isar-sstate: adopt sstate maintenance script Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 19/20] Revert "bitbake: Make 3.6.0 the minimum python version" Anton Mikanovich
2022-07-19 13:00 ` Anton Mikanovich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220719130000.15943-21-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox