4 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index eea654149..9bee6f7d0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- fixed crypto module names when arch is not i586 (#46814)
 - drakauth:
   o handling winbind configuration when REALM != DNS (#49189)
 
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 09606f7ca..0423e3598 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -28,7 +28,7 @@ sub set_loop {
     my $dev = find_free_loop();
 
     if ($o_encrypt_key && $o_encryption) {
-	eval { modules::load('cryptoloop', 'cbc', arch() =~ /i.86/ ? 'aes-i586' : 'aes') };
+	eval { modules::load('cryptoloop', 'cbc', if_(arch() =~ /i.86/, 'aes-i586'), if_( arch() =~ /x86_64/, 'aes-x86_64'), 'aes_generic') };
 	my $cmd = "losetup -p 0 -e $o_encryption $dev $file";
 	log::l("calling $cmd");
 	open(my $F, "|$cmd");
diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm
index b17a18eea..fccc9bf0a 100644
--- a/perl-install/fs/dmcrypt.pm
+++ b/perl-install/fs/dmcrypt.pm
@@ -16,7 +16,7 @@ sub _crypttab() { "$::prefix/etc/crypttab" }
 sub init() {
     whereis_binary('cryptsetup') or die "cryptsetup not installed";
 
-    eval { modules::load('dm-crypt', 'cbc', 'sha256_generic', arch() =~ /i.86/ ? 'aes-i586' : 'aes') };
+    eval { modules::load('dm-crypt', 'cbc', 'sha256_generic', if_(arch() =~ /i.86/, 'aes-i586'), if_( arch() =~ /x86_64/, 'aes-x86_64'), 'aes_generic') };
     devices::init_device_mapper();
     1;
 }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9e05cda32..f7753cac1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix crypto module names when arch is not i586 (#46814)
+
 Version 12.22 - 31 March 2009
 
 - don't list installed distros with other archs as upgrading between