diff options
| author | Ingo Franzki <ifranzki@linux.ibm.com> | 2024-09-02 09:08:02 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-09-03 21:16:23 +0200 |
| commit | c23ce3522540735e51e047f81a171c9261a1ed23 (patch) | |
| tree | 3cd70a86ed868819566559adbdf8756257494031 | |
| parent | s390x: Disable HMAC hardware acceleration when an engine is used for the digest (diff) | |
| download | openssl-c23ce3522540735e51e047f81a171c9261a1ed23.tar.xz openssl-c23ce3522540735e51e047f81a171c9261a1ed23.zip | |
s390x: Fix prehash-by-caller handling for ED25519 and ED448
In case of prehash or prehash-by-caller is set skip the s390x specific
acceleration an fallback to the non-accelerated code path.
Fixes: 66966827740a04249300b0b25735e9d4c9bcab26
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25351)
| -rw-r--r-- | providers/implementations/signature/eddsa_sig.c | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/providers/implementations/signature/eddsa_sig.c b/providers/implementations/signature/eddsa_sig.c index c3473a8927..65447c11a2 100644 --- a/providers/implementations/signature/eddsa_sig.c +++ b/providers/implementations/signature/eddsa_sig.c @@ -401,12 +401,17 @@ static int ed25519_sign(void *vpeddsactx, return 0; } #ifdef S390X_EC_ASM - /* s390x_ed25519_digestsign() does not yet support dom2 or context-strings. - fall back to non-accelerated sign if those options are set. */ + /* + * s390x_ed25519_digestsign() does not yet support dom2 or context-strings. + * fall back to non-accelerated sign if those options are set, or pre-hasing + * is provided. + */ if (S390X_CAN_SIGN(ED25519) && !peddsactx->dom2_flag && !peddsactx->context_string_flag - && peddsactx->context_string_len == 0) { + && peddsactx->context_string_len == 0 + && !peddsactx->prehash_flag + && !peddsactx->prehash_by_caller_flag) { if (s390x_ed25519_digestsign(edkey, sigret, tbs, tbslen) == 0) { ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SIGN); return 0; @@ -504,11 +509,15 @@ static int ed448_sign(void *vpeddsactx, return 0; } #ifdef S390X_EC_ASM - /* s390x_ed448_digestsign() does not yet support context-strings or pre-hashing. - fall back to non-accelerated sign if a context-string or pre-hasing is provided. */ + /* + * s390x_ed448_digestsign() does not yet support context-strings or + * pre-hashing. Fall back to non-accelerated sign if a context-string or + * pre-hasing is provided. + */ if (S390X_CAN_SIGN(ED448) && peddsactx->context_string_len == 0 - && peddsactx->prehash_flag == 0) { + && !peddsactx->prehash_flag + && !peddsactx->prehash_by_caller_flag) { if (s390x_ed448_digestsign(edkey, sigret, tbs, tbslen) == 0) { ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SIGN); return 0; @@ -563,14 +572,18 @@ static int ed25519_verify(void *vpeddsactx, return 0; #ifdef S390X_EC_ASM - /* s390x_ed25519_digestverify() does not yet support dom2 or context-strings. - fall back to non-accelerated verify if those options are set. */ + /* + * s390x_ed25519_digestverify() does not yet support dom2 or context-strings. + * fall back to non-accelerated verify if those options are set, or + * pre-hasing is provided. + */ if (S390X_CAN_SIGN(ED25519) && !peddsactx->dom2_flag && !peddsactx->context_string_flag - && peddsactx->context_string_len == 0) { + && peddsactx->context_string_len == 0 + && !peddsactx->prehash_flag + && !peddsactx->prehash_by_caller_flag) return s390x_ed25519_digestverify(edkey, sig, tbs, tbslen); - } #endif /* S390X_EC_ASM */ if (peddsactx->prehash_flag) { @@ -617,13 +630,16 @@ static int ed448_verify(void *vpeddsactx, return 0; #ifdef S390X_EC_ASM - /* s390x_ed448_digestverify() does not yet support context-strings or pre-hashing. - fall back to non-accelerated verify if a context-string or pre-hasing is provided. */ + /* + * s390x_ed448_digestverify() does not yet support context-strings or + * pre-hashing. Fall back to non-accelerated verify if a context-string or + * pre-hasing is provided. + */ if (S390X_CAN_SIGN(ED448) && peddsactx->context_string_len == 0 - && peddsactx->prehash_flag == 0) { + && !peddsactx->prehash_flag + && !peddsactx->prehash_by_caller_flag) return s390x_ed448_digestverify(edkey, sig, tbs, tbslen); - } #endif /* S390X_EC_ASM */ if (peddsactx->prehash_flag) { |