mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +08:00
86c69fe841
In RISC-V we have multiple extensions, that can be
used to accelerate processing.
The known extensions are defined in riscv_arch.def.
From that file test functions of the following
form are generated: RISCV_HAS_$ext().
In recent commits new ways to define the availability
of these test macros have been defined. E.g.:
#define RV32I_ZKND_ZKNE_CAPABLE \
(RISCV_HAS_ZKND() && RISCV_HAS_ZKNE())
[...]
#define RV64I_ZKND_ZKNE_CAPABLE \
(RISCV_HAS_ZKND() && RISCV_HAS_ZKNE())
This leaves us with two different APIs to test capabilities.
Further, creating the same macros for RV32 and RV64 results
in duplicated code (see example above).
This inconsistent situation makes it hard to integrate
further code. So let's clean this up with the following steps:
* Replace RV32I_* and RV64I_* macros by RICSV_HAS_* macros
* Move all test macros into riscv_arch.h
* Use "AND" and "OR" to combine tests with more than one extension
* Rename include files for accelerated processing (remove extension
postfix).
We end up with compile time tests for RV32/RV64 and run-time tests
for available extensions. Adding new routines (e.g. for vector crypto
instructions) should be straightforward.
Testing showed no regressions.
Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20078)
60 lines
2.3 KiB
C++
60 lines
2.3 KiB
C++
/*
|
|
* Copyright 2022 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
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
/*-
|
|
* RISC-V 64 ZKND ZKNE support for AES modes ecb, cbc, ofb, cfb, ctr.
|
|
* This file is included by cipher_aes_hw.c
|
|
*/
|
|
|
|
#define cipher_hw_rv64i_zknd_zkne_cbc ossl_cipher_hw_generic_cbc
|
|
#define cipher_hw_rv64i_zknd_zkne_ecb ossl_cipher_hw_generic_ecb
|
|
#define cipher_hw_rv64i_zknd_zkne_ofb128 ossl_cipher_hw_generic_ofb128
|
|
#define cipher_hw_rv64i_zknd_zkne_cfb128 ossl_cipher_hw_generic_cfb128
|
|
#define cipher_hw_rv64i_zknd_zkne_cfb8 ossl_cipher_hw_generic_cfb8
|
|
#define cipher_hw_rv64i_zknd_zkne_cfb1 ossl_cipher_hw_generic_cfb1
|
|
#define cipher_hw_rv64i_zknd_zkne_ctr ossl_cipher_hw_generic_ctr
|
|
|
|
static int cipher_hw_rv64i_zknd_zkne_initkey(PROV_CIPHER_CTX *dat,
|
|
const unsigned char *key, size_t keylen)
|
|
{
|
|
int ret;
|
|
PROV_AES_CTX *adat = (PROV_AES_CTX *)dat;
|
|
AES_KEY *ks = &adat->ks.ks;
|
|
|
|
dat->ks = ks;
|
|
|
|
if ((dat->mode == EVP_CIPH_ECB_MODE || dat->mode == EVP_CIPH_CBC_MODE)
|
|
&& !dat->enc) {
|
|
ret = rv64i_zknd_set_decrypt_key(key, keylen * 8, ks);
|
|
dat->block = (block128_f) rv64i_zknd_decrypt;
|
|
dat->stream.cbc = NULL;
|
|
} else {
|
|
ret = rv64i_zkne_set_encrypt_key(key, keylen * 8, ks);
|
|
dat->block = (block128_f) rv64i_zkne_encrypt;
|
|
dat->stream.cbc = NULL;
|
|
}
|
|
|
|
if (ret < 0) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_KEY_SETUP_FAILED);
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
#define PROV_CIPHER_HW_declare(mode) \
|
|
static const PROV_CIPHER_HW rv64i_zknd_zkne_##mode = { \
|
|
cipher_hw_rv64i_zknd_zkne_initkey, \
|
|
cipher_hw_rv64i_zknd_zkne_##mode, \
|
|
cipher_hw_aes_copyctx \
|
|
};
|
|
#define PROV_CIPHER_HW_select(mode) \
|
|
if (RISCV_HAS_ZKND_AND_ZKNE()) \
|
|
return &rv64i_zknd_zkne_##mode;
|