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

cmake: rework NSS and SSL #9831

Merged
merged 2 commits into from Jun 29, 2016
Merged

cmake: rework NSS and SSL #9831

merged 2 commits into from Jun 29, 2016

Commits on Jun 29, 2016

  1. cmake: rework NSS and SSL

    The cmake build should select NSS or CryptoPP consistently with
    current autoconf logic, as used in our RHEL builds (-DWITH_NSS),
    and the SSL linkage must match (for NSS, -lssl3).
    
    With this change, there is no direct linkage with libssl when NSS
    is selected (I still see indirect linkage via libcurl, in turn
    via libssh2, looking into that).
    
    With guidance from upstream and downstream, NSS builds are now
    selected by default.
    
    Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
    mattbenjamin committed Jun 29, 2016
    Copy the full SHA
    83e6680 View commit details
    Browse the repository at this point in the history
  2. automake, ssl: real openssl detection, fix ssl linkage w/NSS

    This change mainly intends to prevent linking with libssl when the
    crypto provider is NSS, which provides an SSL implementation (the
    implementation we must use and prefer when NSS is selected).
    
    Secondarily, actually detect openssl when it is selected, which
    happens by default and co-selects with cryptopp.  To do this, we
    import the ax_check_openssl.m4 from the automake archive.
    
    Since upstream builds now prefer NSS crypto, make this the default.
    
    Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
    mattbenjamin committed Jun 29, 2016
    Copy the full SHA
    1aff646 View commit details
    Browse the repository at this point in the history