Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build failures on AIX #19865

Closed
wants to merge 4 commits into from
Closed

Fix build failures on AIX #19865

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f284f67
CHANGES.md: Fix the 3.0.7 release date
t8m Dec 8, 2022
fdc6532
Do not build P10-specific Chacha20 assembler on AIX
t8m Dec 8, 2022
8dadb35
Do not build P10-specific AES-GCM assembler on AIX
t8m Dec 9, 2022
4062b63
timing_load_creds: Fix typos in the timersub macro
t8m Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ breaking changes, and mappings for the large list of deprecated functions.

[Migration guide]: https://github.com/openssl/openssl/tree/master/doc/man7/migration_guide.pod

### Changes between 3.0.6 and 3.0.7 [xx XXX xxxx]
### Changes between 3.0.6 and 3.0.7 [1 Nov 2022]

* Fixed two buffer overflows in punycode decoding functions.

Expand Down
5 changes: 4 additions & 1 deletion crypto/chacha/build.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ IF[{- !$disabled{asm} -}]
$CHACHAASM_armv4=chacha-armv4.S
$CHACHAASM_aarch64=chacha-armv8.S chacha-armv8-sve.S

$CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s chachap10-ppc.s
$CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s
IF[{- $target{sys_id} ne "AIX" -}]
$CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s chachap10-ppc.s
ENDIF
$CHACHAASM_ppc64=$CHACHAASM_ppc32

$CHACHAASM_c64xplus=chacha-c64xplus.s
Expand Down
6 changes: 4 additions & 2 deletions crypto/chacha/chacha_ppc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp,
size_t len, const unsigned int key[8],
const unsigned int counter[4])
{
#ifndef OPENSSL_SYS_AIX
OPENSSL_ppccap_P & PPC_BRD31
? ChaCha20_ctr32_vsx_p10(out, inp, len, key, counter)
:OPENSSL_ppccap_P & PPC_CRYPTO207
? ChaCha20_ctr32_vsx_p10(out, inp, len, key, counter) :
#endif
OPENSSL_ppccap_P & PPC_CRYPTO207
? ChaCha20_ctr32_vsx(out, inp, len, key, counter)
: OPENSSL_ppccap_P & PPC_ALTIVEC
? ChaCha20_ctr32_vmx(out, inp, len, key, counter)
Expand Down