[openssl] master update

Richard Levitte levitte at openssl.org
Fri Mar 26 10:25:54 UTC 2021


The branch master has been updated
       via  814581bb7a1360ee054ad3500cd0907fbfeef915 (commit)
      from  4551763efc8c9d2e39f3d39430cb4657d155cde6 (commit)


- Log -----------------------------------------------------------------
commit 814581bb7a1360ee054ad3500cd0907fbfeef915
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 24 19:51:01 2021 +0100

    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 <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14676)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rsa/rsa_ameth.c                                    | 2 +-
 providers/implementations/encode_decode/encode_key2text.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 067b7db12d..7a747a33ef 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -280,7 +280,7 @@ static int rsa_pss_param_print(BIO *bp, int pss_key, RSA_PSS_PARAMS *pss,
     if (pss->trailerField) {
         if (i2a_ASN1_INTEGER(bp, pss->trailerField) <= 0)
             goto err;
-    } else if (BIO_puts(bp, "BC (default)") <= 0) {
+    } else if (BIO_puts(bp, "01 (default)") <= 0) {
         goto err;
     }
     BIO_puts(bp, "\n");
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)


More information about the openssl-commits mailing list