Skip to content

Commit be91c0f

Browse files
jakemasjakemas
committed
remove delocator fixes on aes gcm code
1 parent 5980e8f commit be91c0f

3 files changed

Lines changed: 25 additions & 64 deletions

File tree

‎crypto/fipsmodule/aes/mode_wrappers.c‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,12 @@
5858
// function pointer calculation in AES_ctr128_encrypt. Without it,
5959
// on AArch64 there is risk of the calculations requiring a PC-relative
6060
// offset outside of the range (-1MB,1MB) addressable using `ADR`.
61-
static inline void aes_hw_encrypt_wrapper(const uint8_t *in, uint8_t *out,
62-
const AES_KEY *key) {
63-
aes_hw_encrypt(in, out, key);
64-
}
65-
66-
static inline void vpaes_encrypt_wrapper(const uint8_t *in, uint8_t *out,
67-
const AES_KEY *key) {
68-
vpaes_encrypt(in, out, key);
69-
}
70-
71-
static inline void aes_nohw_encrypt_wrapper(const uint8_t *in, uint8_t *out,
72-
const AES_KEY *key) {
73-
aes_nohw_encrypt(in, out, key);
74-
}
75-
7661
static inline void aes_hw_ctr32_encrypt_blocks_wrapper(const uint8_t *in,
77-
uint8_t *out, size_t len,
78-
const AES_KEY *key,
79-
const uint8_t ivec[16]) {
80-
aes_hw_ctr32_encrypt_blocks(in, out, len, key, ivec);
81-
}
82-
83-
static inline void aes_nohw_ctr32_encrypt_blocks_wrapper(const uint8_t *in,
84-
uint8_t *out, size_t len,
85-
const AES_KEY *key,
86-
const uint8_t ivec[16]) {
87-
aes_nohw_ctr32_encrypt_blocks(in, out, len, key, ivec);
62+
uint8_t *out, size_t len,
63+
const AES_KEY *key,
64+
const uint8_t ivec[16])
65+
{
66+
aes_hw_ctr32_encrypt_blocks(in, out, len, key, ivec);
8867
}
8968

9069
#if defined(VPAES_CTR32)
@@ -94,7 +73,12 @@ static inline void vpaes_ctr32_encrypt_blocks_wrapper(const uint8_t *in,
9473
const uint8_t ivec[16]) {
9574
vpaes_ctr32_encrypt_blocks(in, out, len, key, ivec);
9675
}
97-
#endif
76+
#else // VPAES_CTR32
77+
static inline void vpaes_encrypt_wrapper(const uint8_t *in, uint8_t *out,
78+
const AES_KEY *key) {
79+
vpaes_encrypt(in, out, key);
80+
}
81+
#endif // !VPAES_CTR32
9882

9983
void AES_ctr128_encrypt(const uint8_t *in, uint8_t *out, size_t len,
10084
const AES_KEY *key, uint8_t ivec[AES_BLOCK_SIZE],
@@ -114,7 +98,7 @@ void AES_ctr128_encrypt(const uint8_t *in, uint8_t *out, size_t len,
11498
#endif
11599
} else {
116100
CRYPTO_ctr128_encrypt_ctr32(in, out, len, key, ivec, ecount_buf, num,
117-
aes_nohw_ctr32_encrypt_blocks_wrapper);
101+
aes_nohw_ctr32_encrypt_blocks);
118102
}
119103

120104
FIPS_service_indicator_update_state();

‎crypto/fipsmodule/cipher/e_aes.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -304,40 +304,40 @@ ctr128_f aes_ctr_set_key(AES_KEY *aes_key, GCM128_KEY *gcm_key,
304304
if (hwaes_capable()) {
305305
aes_hw_set_encrypt_key(key, (int)key_bytes * 8, aes_key);
306306
if (gcm_key != NULL) {
307-
CRYPTO_gcm128_init_key(gcm_key, aes_key, aes_hw_encrypt_wrapper, 1);
307+
CRYPTO_gcm128_init_key(gcm_key, aes_key, aes_hw_encrypt, 1);
308308
}
309309
if (out_block) {
310-
*out_block = aes_hw_encrypt_wrapper;
310+
*out_block = aes_hw_encrypt;
311311
}
312-
return aes_hw_ctr32_encrypt_blocks_wrapper;
312+
return aes_hw_ctr32_encrypt_blocks;
313313
}
314314

315315
if (vpaes_capable()) {
316316
vpaes_set_encrypt_key(key, (int)key_bytes * 8, aes_key);
317317
if (out_block) {
318-
*out_block = vpaes_encrypt_wrapper;
318+
*out_block = vpaes_encrypt;
319319
}
320320
if (gcm_key != NULL) {
321-
CRYPTO_gcm128_init_key(gcm_key, aes_key, vpaes_encrypt_wrapper, 0);
321+
CRYPTO_gcm128_init_key(gcm_key, aes_key, vpaes_encrypt, 0);
322322
}
323323
#if defined(BSAES)
324324
assert(bsaes_capable());
325325
return vpaes_ctr32_encrypt_blocks_with_bsaes;
326326
#elif defined(VPAES_CTR32)
327-
return vpaes_ctr32_encrypt_blocks_wrapper;
327+
return vpaes_ctr32_encrypt_blocks;
328328
#else
329329
return NULL;
330330
#endif
331331
}
332332

333333
aes_nohw_set_encrypt_key(key, (int)key_bytes * 8, aes_key);
334334
if (gcm_key != NULL) {
335-
CRYPTO_gcm128_init_key(gcm_key, aes_key, aes_nohw_encrypt_wrapper, 0);
335+
CRYPTO_gcm128_init_key(gcm_key, aes_key, aes_nohw_encrypt, 0);
336336
}
337337
if (out_block) {
338-
*out_block = aes_nohw_encrypt_wrapper;
338+
*out_block = aes_nohw_encrypt;
339339
}
340-
return aes_nohw_ctr32_encrypt_blocks_wrapper;
340+
return aes_nohw_ctr32_encrypt_blocks;
341341
}
342342

343343
#if defined(OPENSSL_32_BIT)

‎crypto/fipsmodule/modes/gcm.c‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -224,29 +224,6 @@ static size_t hw_gcm_decrypt(const uint8_t *in, uint8_t *out, size_t len,
224224

225225
#endif // HW_GCM && AARCH64
226226

227-
// Trampolines for GCM function pointers to avoid delocator issues with adr
228-
// on AArch64. Without these wrappers, the function pointer calculations
229-
// may require PC-relative offsets outside the addressable range.
230-
#if defined(GHASH_ASM_ARM)
231-
static inline void gcm_gmult_v8_wrapper(uint8_t Xi[16], const u128 Htable[16]) {
232-
gcm_gmult_v8(Xi, Htable);
233-
}
234-
235-
static inline void gcm_ghash_v8_wrapper(uint8_t Xi[16], const u128 Htable[16],
236-
const uint8_t *inp, size_t len) {
237-
gcm_ghash_v8(Xi, Htable, inp, len);
238-
}
239-
240-
static inline void gcm_gmult_neon_wrapper(uint8_t Xi[16], const u128 Htable[16]) {
241-
gcm_gmult_neon(Xi, Htable);
242-
}
243-
244-
static inline void gcm_ghash_neon_wrapper(uint8_t Xi[16], const u128 Htable[16],
245-
const uint8_t *inp, size_t len) {
246-
gcm_ghash_neon(Xi, Htable, inp, len);
247-
}
248-
#endif
249-
250227
void CRYPTO_ghash_init(gmult_func *out_mult, ghash_func *out_hash,
251228
u128 out_table[16], int *out_is_avx,
252229
const uint8_t gcm_key[16]) {
@@ -301,15 +278,15 @@ void CRYPTO_ghash_init(gmult_func *out_mult, ghash_func *out_hash,
301278
#elif defined(GHASH_ASM_ARM)
302279
if (gcm_pmull_capable()) {
303280
gcm_init_v8(out_table, H);
304-
*out_mult = gcm_gmult_v8_wrapper;
305-
*out_hash = gcm_ghash_v8_wrapper;
281+
*out_mult = gcm_gmult_v8;
282+
*out_hash = gcm_ghash_v8;
306283
return;
307284
}
308285

309286
if (gcm_neon_capable()) {
310287
gcm_init_neon(out_table, H);
311-
*out_mult = gcm_gmult_neon_wrapper;
312-
*out_hash = gcm_ghash_neon_wrapper;
288+
*out_mult = gcm_gmult_neon;
289+
*out_hash = gcm_ghash_neon;
313290
return;
314291
}
315292
#elif defined(GHASH_ASM_PPC64LE)

0 commit comments

Comments
 (0)