Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v6.x backport] src: guard bundled_ca/openssl_ca with HAVE_OPENSSL #17783

Closed
wants to merge 2 commits into from

Commits on Dec 20, 2017

  1. src: add --use-bundled-ca --use-openssl-ca check

    The --use-bundled-ca and --use-openssl-ca command line arguments are
    mutually exclusive but can both be used on the same command line.
    
    This commit adds a check if both options are used.
    
    Fixes: nodejs#12083
    PR-URL: nodejs#12087
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: Richard Lau <riclau@uk.ibm.com>
    Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
    danbev committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    c3f35be View commit details
    Browse the repository at this point in the history
  2. src: guard bundled_ca/openssl_ca with HAVE_OPENSSL

    Currently, the following warning will be reported when configuring
    without-ssl:
    
    ../src/node.cc:3653:8: warning: unused variable 'use_bundled_ca'
    [-Wunused-variable]
      bool use_bundled_ca = false;
           ^
    ../src/node.cc:3654:8: warning: unused variable 'use_openssl_ca'
    [-Wunused-variable]
      bool use_openssl_ca = false;
           ^
    
    I missed this when working on
    commit 8a7db9d ("src: add
    --use-bundled-ca --use-openssl-ca check").
    
    Refs: nodejs#12087
    PR-URL: nodejs#12302
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: Richard Lau <riclau@uk.ibm.com>
    Reviewed-By: Anna Henningsen <anna@addaleax.net>
    danbev committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    c7bea9f View commit details
    Browse the repository at this point in the history