Skip to content

Conversation

@kpumuk
Copy link
Contributor

@kpumuk kpumuk commented Nov 23, 2025

The truststore and keystore were regenerated using keys in test/keys:

# keytool does not support "replace" operation:
keytool -delete \
    -alias localhost \
    -keystore lib/java/src/crossTest/resources/.truststore \
    -storepass thrift
keytool -import \
    -alias localhost \
    -file test/keys/CA.pem \
    -keystore lib/java/src/crossTest/resources/.truststore \
    -storepass thrift

# server keystore
keytool -importkeystore \
    -srckeystore test/keys/server.p12 \
    -srcstoretype PKCS12 \
    -srcstorepass thrift \
    -destkeystore lib/java/src/crossTest/resources/.serverkeystore \
    -deststoretype pkcs12 \
    -deststorepass thrift

# client keystore
keytool -importkeystore \
    -srckeystore test/keys/client.p12 \
    -srcstoretype PKCS12 \
    -srcstorepass thrift \
    -destkeystore lib/java/src/crossTest/resources/.clientkeystore \
    -deststoretype pkcs12 \
    -deststorepass thrift

Java tests were updated to use separate keystores for client and server.

More discussion in the original commit from @Jens-G that introduces new keys: b18964e

Also reverts #3237

  • Did you create an Apache Jira ticket? (Request account here, not required for trivial changes)
  • If a ticket exists: Does your pull request title follow the pattern "THRIFT-NNNN: describe my issue"?
  • Did you squash your changes to a single commit? (not required, but preferred)
  • Did you do your best to avoid breaking changes? If one was needed, did you label the Jira ticket with "Breaking-Change"?
  • If your change does not involve any code, include [skip ci] anywhere in the commit message to free up build resources.

@kpumuk
Copy link
Contributor Author

kpumuk commented Nov 23, 2025

@kpumuk kpumuk changed the title Updated Java keys for cross-platform tests Updated Java keys for cross-platform tests and removed them from known failures Nov 24, 2025
The truststore and keystore were regenerated using keys in test/keys:

    # keytool does not support "replace" operation:
    keytool -delete \
        -alias localhost \
        -keystore lib/java/src/crossTest/resources/.truststore \
        -storepass thrift
    keytool -import \
        -alias localhost \
        -file test/keys/CA.pem \
        -keystore lib/java/src/crossTest/resources/.truststore \
        -storepass thrift

    # server keystore
    keytool -importkeystore \
        -srckeystore test/keys/server.p12 \
        -srcstoretype PKCS12 \
        -srcstorepass thrift \
        -destkeystore lib/java/src/crossTest/resources/.serverkeystore \
        -deststoretype pkcs12 \
        -deststorepass thrift

    # client keystore
    keytool -importkeystore \
        -srckeystore test/keys/client.p12 \
        -srcstoretype PKCS12 \
        -srcstorepass thrift \
        -destkeystore lib/java/src/crossTest/resources/.clientkeystore \
        -deststoretype pkcs12 \
        -deststorepass thrift

Java tests were updated to use separate keystores for client and server.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants