public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the padlock engine

Browse source 
... after it was broken for almost 5 years,
since the first 1.1.1 release.
Note: The last working version was 1.1.0l release.

Fixes #20073

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20146)
This commit is contained in:
Bernd Edlinger 2023-01-26 15:45:03 +01:00 • committed by Hugo Landau
parent bcd94b6335
commit 849ed515c7
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/e_padlock.c
View file

@ -146,6 +146,19 @@ static int padlock_init(ENGINE *e)
return (padlock_use_rng || padlock_use_ace); return (padlock_use_rng || padlock_use_ace);
} }
# ifndef AES_ASM
static int padlock_aes_set_encrypt_key(const unsigned char *userKey,
const int bits,
AES_KEY *key);
static int padlock_aes_set_decrypt_key(const unsigned char *userKey,
const int bits,
AES_KEY *key);
# define AES_ASM
# define AES_set_encrypt_key padlock_aes_set_encrypt_key
# define AES_set_decrypt_key padlock_aes_set_decrypt_key
# include "../crypto/aes/aes_core.c"
# endif
/* /*
* This stuff is needed if this ENGINE is being compiled into a * This stuff is needed if this ENGINE is being compiled into a
* self-contained shared-library. * self-contained shared-library.
@ -646,12 +659,10 @@ padlock_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
AES_set_decrypt_key(key, key_len, &cdata->ks); AES_set_decrypt_key(key, key_len, &cdata->ks);
else else
AES_set_encrypt_key(key, key_len, &cdata->ks); AES_set_encrypt_key(key, key_len, &cdata->ks);
# ifndef AES_ASM
/* /*
* OpenSSL C functions use byte-swapped extended key. * OpenSSL C functions use byte-swapped extended key.
*/ */
padlock_key_bswap(&cdata->ks); padlock_key_bswap(&cdata->ks);
# endif
cdata->cword.b.keygen = 1; cdata->cword.b.keygen = 1;
break; break;