Commit `14416b522e`

Frank Denis <124872+jedisct1@users.noreply.github.com>

2022-12-07 04:49:20

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.

master

1 parent e7d2834

Changed files (1)

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: {

Commit 14416b522e

Commit `14416b522e`