diff --git a/sys/crypto/openssl/amd64/e_padlock-x86_64.S b/sys/crypto/openssl/amd64/e_padlock-x86_64.S
index de286684465..b19cf1d0b2d 100644
--- a/sys/crypto/openssl/amd64/e_padlock-x86_64.S
+++ b/sys/crypto/openssl/amd64/e_padlock-x86_64.S
@@ -45,6 +45,8 @@ padlock_capability:
 .align	16
 padlock_key_bswap:
 	movl	240(%rdi),%edx
+	incl	%edx
+	shll	$2,%edx
 .Lbswap_loop:
 	movl	(%rdi),%eax
 	bswapl	%eax
diff --git a/sys/crypto/openssl/i386/e_padlock-x86.S b/sys/crypto/openssl/i386/e_padlock-x86.S
index 4ddc50bcaf5..58085b33679 100644
--- a/sys/crypto/openssl/i386/e_padlock-x86.S
+++ b/sys/crypto/openssl/i386/e_padlock-x86.S
@@ -69,6 +69,8 @@ padlock_key_bswap:
 .L_padlock_key_bswap_begin:
 	movl	4(%esp),%edx
 	movl	240(%edx),%ecx
+	incl	%ecx
+	shll	$2,%ecx
 .L003bswap_loop:
 	movl	(%edx),%eax
 	bswap	%eax
@@ -1109,6 +1111,8 @@ padlock_key_bswap:
 .L_padlock_key_bswap_begin:
 	movl	4(%esp),%edx
 	movl	240(%edx),%ecx
+	incl	%ecx
+	shll	$2,%ecx
 .L003bswap_loop:
 	movl	(%edx),%eax
 	bswap	%eax