[openssl/openssl] 6b08b7: Remove duplicate code

[Kornel Dulęba]

  Branch: refs/heads/master
  Home:   https://github.com/openssl/openssl
  Commit: 6b08b786ccba8fb84759a487cca439566a8678c2
      https://github.com/openssl/openssl/commit/6b08b786ccba8fb84759a487cca439566a8678c2
  Author: zhangzhilei <zhangzhilei at 360.cn>
  Date:   2023-03-15 (Wed, 15 Mar 2023)

  Changed paths:
    M providers/implementations/ciphers/cipher_aes_gcm_hw.c

  Log Message:
  -----------
  Remove duplicate code

since this code is also under GCM_HW_SET_KEY_CTR_FN macro

Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove at arm.com>
(Merged from https://github.com/openssl/openssl/pull/20491)


  Commit: 27093ba73372935fe4ef91d0a45ce6ea90a1ac8e
      https://github.com/openssl/openssl/commit/27093ba73372935fe4ef91d0a45ce6ea90a1ac8e
  Author: Kornel Dulęba <mindal at semihalf.com>
  Date:   2023-03-15 (Wed, 15 Mar 2023)

  Changed paths:
    M crypto/aes/asm/bsaes-armv7.pl

  Log Message:
  -----------
  aes/asm/bsaes-armv7.pl: Replace adrl with add

"adrl" is a pseudo-instruction used to calculate an address relative
to PC. It's not recognized by clang resulting in a compilation error.
I've stumbled upon it when trying to integrate the bsaes-armv7 assmebly
logic into FreeBSD kernel, which uses clang as it's default compiler.
Note that this affect the build only if BSAES_ASM_EXTENDED_KEY is
defined, which is not the default option in OpenSSL.

The solution here is to replace it with an add instruction.
This mimics what has already been done in !BSAES_ASM_EXTENDED_KEY logic.
Because of that I've marked this as trivial CLA.

CLA: trivial
Signed-off-by: Kornel Dulęba <mindal at semihalf.com>

Reviewed-by: Tom Cosgrove <tom.cosgrove at arm.com>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20458)


Compare: https://github.com/openssl/openssl/compare/93b0a1ea614f...27093ba73372