[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  ac52f42aca9fe0933f7564581268ac50c826bd39 (commit)
      from  316d527ff9b6597105df399fc222ea328cd827bf (commit)


- Log -----------------------------------------------------------------
commit ac52f42aca9fe0933f7564581268ac50c826bd39
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Jun 6 09:51:12 2018 +0100

    Fix no-dsa
    
    Broken by 0336df2fa.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6427)

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

Summary of changes:
 apps/req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/req.c b/apps/req.c
index 59baa89..7e7b994 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -523,11 +523,13 @@ int req_main(int argc, char **argv)
                        "         Your key size is %ld! Larger key size may behave not as expected.\n",
                        OPENSSL_RSA_MAX_MODULUS_BITS, newkey);
 
+#ifndef OPENSSL_NO_DSA
         if (pkey_type == EVP_PKEY_DSA && newkey > OPENSSL_DSA_MAX_MODULUS_BITS)
             BIO_printf(bio_err,
                        "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
                        "         Your key size is %ld! Larger key size may behave not as expected.\n",
                        OPENSSL_DSA_MAX_MODULUS_BITS, newkey);
+#endif
 
         if (genctx == NULL) {
             genctx = set_keygen_ctx(NULL, &pkey_type, &newkey,