From 814581bb7a1360ee054ad3500cd0907fbfeef915 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 24 Mar 2021 19:51:01 +0100 Subject: RSA-PSS: When printing parameters, always print the trailerfield ASN.1 value The legacy implementation would print the ASN.1 value of the trailerfield, except when it wasn't set (i.e. is default). For better consistency, we now always print the ASN.1 value, both in the legacy and the provided implementation. Fixes #14363 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14676) --- providers/implementations/encode_decode/encode_key2text.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'providers/implementations/encode_decode') diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c index f913a9bb14..9bdbe52656 100644 --- a/providers/implementations/encode_decode/encode_key2text.c +++ b/providers/implementations/encode_decode/encode_key2text.c @@ -764,13 +764,6 @@ static int rsa_to_text(BIO *out, const void *key, int selection) saltlen, (saltlen == 20 ? " (default)" : "")) <= 0) goto err; - /* - * TODO(3.0) Should we show the ASN.1 trailerField value, or - * the actual trailerfield byte (i.e. 0xBC for 1)? - * crypto/rsa/rsa_ameth.c isn't very clear on that, as it - * does display 0xBC when the default applies, but the ASN.1 - * trailerField value otherwise... - */ if (BIO_printf(out, " Trailer Field: 0x%x%s\n", trailerfield, (trailerfield == 1 ? " (default)" : "")) <= 0) -- cgit v1.2.3