Skip to content

Allow EC Keys #12399

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Oct 17, 2025
Merged

Allow EC Keys #12399

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32f8aad
allow ec keys
gtcooke94 Oct 2, 2025
51f37ba
add ec spiffebundle
gtcooke94 Oct 3, 2025
fceb279
variable name
gtcooke94 Oct 3, 2025
85074ef
format
gtcooke94 Oct 3, 2025
e5b7dd2
formatting
gtcooke94 Oct 3, 2025
9086f6f
actually add the new bundle file
gtcooke94 Oct 3, 2025
e846359
add file in the right place
gtcooke94 Oct 3, 2025
d695940
moved the file but it got lost to git
gtcooke94 Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions core/src/test/java/io/grpc/internal/SpiffeUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ public static class CertificateApiTest {
private static final String SERVER_0_PEM_FILE = "server0.pem";
private static final String TEST_DIRECTORY_PREFIX = "io/grpc/internal/";
private static final String SPIFFE_TRUST_BUNDLE = "spiffebundle.json";
private static final String SPIFFE_TRUST_BUNDLE_WITH_EC_KTY = "spiffebundle_ec.json";
private static final String SPIFFE_TRUST_BUNDLE_MALFORMED = "spiffebundle_malformed.json";
private static final String SPIFFE_TRUST_BUNDLE_CORRUPTED_CERT =
"spiffebundle_corrupted_cert.json";
Expand Down Expand Up @@ -311,6 +312,19 @@ public void loadTrustBundleFromFileSuccessTest() throws Exception {
.toArray(new X509Certificate[0]));
assertTrue(spiffeId.isPresent());
assertEquals("foo.bar.com", spiffeId.get().getTrustDomain());

SpiffeBundle tb_ec = SpiffeUtil.loadTrustBundleFromFile(copyFileToTmp(SPIFFE_TRUST_BUNDLE_WITH_EC_KTY));
assertEquals(2, tb_ec.getSequenceNumbers().size());
assertEquals(12035488L, (long) tb_ec.getSequenceNumbers().get("example.com"));
assertEquals(-1L, (long) tb_ec.getSequenceNumbers().get("test.example.com"));
assertEquals(3, tb_ec.getBundleMap().size());
assertEquals(0, tb_ec.getBundleMap().get("test.google.com.au").size());
assertEquals(1, tb_ec.getBundleMap().get("example.com").size());
assertEquals(2, tb_ec.getBundleMap().get("test.example.com").size());
Optional<SpiffeId> spiffeId = SpiffeUtil.extractSpiffeId(tb_ec.getBundleMap().get("example.com")
.toArray(new X509Certificate[0]));
assertTrue(spiffeId.isPresent());
assertEquals("foo.bar.com", spiffeId.get().getTrustDomain());
}

@Test
Expand Down
Loading