commit 14416b522e697997f21dd634bfdc70fbff59471b (tree)
parent e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
Author: Frank Denis <124872+jedisct1@users.noreply.github.com>
Date: Wed, 7 Dec 2022 04:49:20 +0100
Revert "std.crypto.aes: use software implementation in comptime context (#13792)" (#13798)
This reverts commit d4adf4420071397d993bac629a9da27b33c67ca3.
Unfortunately, this is not the right place to check if AES functions
are being used at comptime or not.
Diffstat:
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/std/crypto/aes.zig b/lib/std/crypto/aes.zig
@@ -2,19 +2,10 @@ const std = @import("../std.zig");
const builtin = @import("builtin");
const testing = std.testing;
-fn isComptime() bool {
- var a: u8 = 0;
- return @typeInfo(@TypeOf(.{a})).Struct.fields[0].is_comptime;
-}
-
const has_aesni = std.Target.x86.featureSetHas(builtin.cpu.features, .aes);
const has_avx = std.Target.x86.featureSetHas(builtin.cpu.features, .avx);
const has_armaes = std.Target.aarch64.featureSetHas(builtin.cpu.features, .aes);
-const impl = if (isComptime())
-impl: {
- break :impl @import("aes/soft.zig");
-} else if (builtin.cpu.arch == .x86_64 and has_aesni and has_avx)
-impl: {
+const impl = if (builtin.cpu.arch == .x86_64 and has_aesni and has_avx) impl: {
break :impl @import("aes/aesni.zig");
} else if (builtin.cpu.arch == .aarch64 and has_armaes)
impl: {