diff options
author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /configs | |
parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'configs')
-rw-r--r-- | configs/mingw32_defconfig | 1 | ||||
-rw-r--r-- | configs/mingw64_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 408b13eb8..98288bfb2 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
@@ -114,6 +114,7 @@ CONFIG_PASSWORD_MINLEN=6 | |||
114 | CONFIG_MD5_SMALL=1 | 114 | CONFIG_MD5_SMALL=1 |
115 | CONFIG_SHA1_SMALL=3 | 115 | CONFIG_SHA1_SMALL=3 |
116 | # CONFIG_SHA1_HWACCEL is not set | 116 | # CONFIG_SHA1_HWACCEL is not set |
117 | # CONFIG_SHA256_HWACCEL is not set | ||
117 | CONFIG_SHA3_SMALL=1 | 118 | CONFIG_SHA3_SMALL=1 |
118 | # CONFIG_FEATURE_FAST_TOP is not set | 119 | # CONFIG_FEATURE_FAST_TOP is not set |
119 | # CONFIG_FEATURE_ETC_NETWORKS is not set | 120 | # CONFIG_FEATURE_ETC_NETWORKS is not set |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index 05596ab8e..1ce3831a9 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
@@ -114,6 +114,7 @@ CONFIG_PASSWORD_MINLEN=6 | |||
114 | CONFIG_MD5_SMALL=1 | 114 | CONFIG_MD5_SMALL=1 |
115 | CONFIG_SHA1_SMALL=3 | 115 | CONFIG_SHA1_SMALL=3 |
116 | # CONFIG_SHA1_HWACCEL is not set | 116 | # CONFIG_SHA1_HWACCEL is not set |
117 | # CONFIG_SHA256_HWACCEL is not set | ||
117 | CONFIG_SHA3_SMALL=1 | 118 | CONFIG_SHA3_SMALL=1 |
118 | # CONFIG_FEATURE_FAST_TOP is not set | 119 | # CONFIG_FEATURE_FAST_TOP is not set |
119 | # CONFIG_FEATURE_ETC_NETWORKS is not set | 120 | # CONFIG_FEATURE_ETC_NETWORKS is not set |