[openssl] master update

[nic.tuv at gmail.com]

The branch master has been updated
       via  2edb571b4b857e51620bfd93e240e39de40cb456 (commit)
      from  df4c1d80b2c332e8ea94b95eca0bea8b2e7c19fb (commit)


- Log -----------------------------------------------------------------
commit 2edb571b4b857e51620bfd93e240e39de40cb456
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date:   Fri Jun 12 18:11:09 2020 +0300

    Fix nits detected by make cmd-nits
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/12127)

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

Summary of changes:
 apps/rsa.c               | 2 +-
 doc/man7/EVP_PKEY-DH.pod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rsa.c b/apps/rsa.c
index 9f91b72d20..0464729f71 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -65,9 +65,9 @@ const OPTIONS rsa_options[] = {
     {"pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)"},
     {"pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level"},
     {"pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding"},
+#endif
 
     OPT_PROV_OPTIONS,
-#endif
     {NULL}
 };
 
diff --git a/doc/man7/EVP_PKEY-DH.pod b/doc/man7/EVP_PKEY-DH.pod
index d2a49b7bfa..6720417673 100644
--- a/doc/man7/EVP_PKEY-DH.pod
+++ b/doc/man7/EVP_PKEY-DH.pod
@@ -147,7 +147,7 @@ Legacy B<DH> domain parameters can be generated by calling:
 
     pctx = EVP_PKEY_CTX_new_from_name(NULL, "DH", NULL);
     EVP_PKEY_paramgen_init(pctx);
-    
+
     params[0] = OSSL_PARAM_construct_uint("pbits", &pbits);
     params[1] = OSSL_PARAM_construct_uint("qbits", &qbits);
     params[2] = OSSL_PARAM_construct_int("gindex", &gindex);