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

Correctly handle PKCS#11 tokens for system keystore #33460

Merged
merged 4 commits into from Sep 10, 2018

Commits on Sep 6, 2018

  1. Correctly handle NONE keyword for system keystore

    As defined in the PKCS#11 reference guide
    https://docs.oracle.com/javase/8/docs/technotes/guides/security/p11guide.html
    PKCS#11 tokens can be used as the JSSE keystore and truststore and
    the way to indicate this is to set `javax.net.ssl.keyStore` and
    `javax.net.ssl.trustStore` to `NONE` (case sensitive).
    
    This commits ensures that we honor this convention and do not
    attempt to load the keystore or truststore if the system property is
    set to NONE.
    
    Relates elastic#33459
    jkakavas committed Sep 6, 2018
    Copy the full SHA
    a4152f7 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    7b48615 View commit details
    Browse the repository at this point in the history
  3. Handle password protected system truststore

    When a PKCS#11 token is used as the system truststore, we need to
    pass a password when loading it, even if only for reading
    certificate entries. This commit ensures that if
    `javax.net.ssl.trustStoreType` is set to `PKCS#11` (as it would
    when a PKCS#11 token is in use) the password specified in
    `javax.net.ssl.trustStorePassword` is passed when attempting to
    load the truststore.
    jkakavas committed Sep 6, 2018
    Copy the full SHA
    3de4aef View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2018

  1. Copy the full SHA
    dc753cb View commit details
    Browse the repository at this point in the history