diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-10-24 18:55:56 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-10-26 17:02:36 +0000 |
| commit | 930cec16d9ee11584a10130bef9be002113e31de (patch) | |
| tree | 80bbfbaa15cc2df17834c351cf0fd0fb702b30ff /crypto/openssl/crypto/modes/asm/ghashv8-armx.pl | |
| parent | 3acc60b4121f205b529039976a1f16f4db449190 (diff) | |
| download | src-930cec16d9ee11584a10130bef9be002113e31de.tar.gz src-930cec16d9ee11584a10130bef9be002113e31de.zip | |
OpenSSL: update to 3.0.12
OpenSSL 3.0.12 addresses:
* Fix incorrect key and IV resizing issues when calling
EVP_EncryptInit_ex2(), EVP_DecryptInit_ex2() or EVP_CipherInit_ex2()
with OSSL_PARAM parameters that alter the key or IV length
([CVE-2023-5363]).
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
(cherry picked from commit ad991e4c142ebabad7aef488ad97b189ecabb270)
(cherry picked from commit 575878a533823aa3e5bab715928d9cdffbc4dcbc)
(cherry picked from commit e833378cf9589171562ccad4c6ff59c3713770bd)
Approved by: so
Approved by: re (gjb)
Diffstat (limited to 'crypto/openssl/crypto/modes/asm/ghashv8-armx.pl')
| -rw-r--r-- | crypto/openssl/crypto/modes/asm/ghashv8-armx.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl b/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl index b1d35d25b5b1..b3d94041729e 100644 --- a/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -744,6 +744,9 @@ if ($flavour =~ /64/) { ######## 64-bit code s/\.[uisp]?64//o and s/\.16b/\.2d/go; s/\.[42]([sd])\[([0-3])\]/\.$1\[$2\]/o; + # Switch preprocessor checks to aarch64 versions. + s/__ARME([BL])__/__AARCH64E$1__/go; + print $_,"\n"; } } else { ######## 32-bit code |