[java-opensaml] branch main updated: Re-enable EC cert test using new cert with named curve secp384r1.
Brent Putman
putmanb at georgetown.edu
Mon Sep 21 17:16:37 UTC 2020
This is an automated email from the git hooks/post-receive script.
putmanb pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=e5ed72e84367aacf7824f6277453a80f573507a0
The following commit(s) were added to refs/heads/main by this push:
new e5ed72e84 Re-enable EC cert test using new cert with named curve secp384r1.
e5ed72e84 is described below
commit e5ed72e84367aacf7824f6277453a80f573507a0
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Mon Sep 21 13:16:34 2020 -0400
Re-enable EC cert test using new cert with named curve secp384r1.
This curve is supported in Java 15+.
---
.../org/opensaml/security/x509/X509SupportTest.java | 5 +----
.../src/test/resources/data/ec-certificate.pem | 20 +++++++++++---------
.../src/test/resources/data/ec-privkey-nopass.pem | 9 +++++----
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java b/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java
index ce31c10a3..72bb2e576 100644
--- a/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java
+++ b/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java
@@ -609,13 +609,10 @@ public class X509SupportTest {
/**
* Test decoding and matching EC keypair.
- *
- * TODO this target cert is based on named curve secp256k1, which is no longer universally supported, e.g. not in OpenJDK 15.
- * Need to re-generate new keypair and cert test target based on a supported one, e.g. secp256r1.
*
* @throws Exception if something goes wrong
*/
- @Test(enabled=false)
+ @Test()
public void testEC() throws Exception {
InputStream certInS = X509SupportTest.class.getResourceAsStream(certEC);
diff --git a/opensaml-security-api/src/test/resources/data/ec-certificate.pem b/opensaml-security-api/src/test/resources/data/ec-certificate.pem
index 1472d0340..4b1141515 100644
--- a/opensaml-security-api/src/test/resources/data/ec-certificate.pem
+++ b/opensaml-security-api/src/test/resources/data/ec-certificate.pem
@@ -1,11 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBqDCCAU6gAwIBAgIJAN57+S/joHl2MAoGCCqGSM49BAMCMDIxCzAJBgNVBAYT
-AlVTMQ0wCwYDVQQIDARPaGlvMRQwEgYDVQQDDAt0ZXN0LXNlcnZlcjAeFw0xODA1
-MDQxNzQ4MDRaFw0xODA2MDMxNzQ4MDRaMDIxCzAJBgNVBAYTAlVTMQ0wCwYDVQQI
-DARPaGlvMRQwEgYDVQQDDAt0ZXN0LXNlcnZlcjBWMBAGByqGSM49AgEGBSuBBAAK
-A0IABLQ89hKV/avpvYaz672vx8LHMTVzG6BnIIWhz9Jrc61XVqnAg5abtb0F0b35
-Gsf/pdrK16pvv+C5ecdsS79dPJajUDBOMB0GA1UdDgQWBBR/pheyXhMejk4y5XW2
-NeOgw6YfnzAfBgNVHSMEGDAWgBR/pheyXhMejk4y5XW2NeOgw6YfnzAMBgNVHRME
-BTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIFDTzKMe8UaMl67GYaLlAAtceitrY0dS
-zrKyKtwNUf4MAiEAjSZZpjB7gZUG9+7Q7Yck6uk6hiCI9zlrf3r8XnzoAQg=
+MIIB6zCCAXGgAwIBAgIJAPCl1yh7K2PvMAoGCCqGSM49BAMCMDIxCzAJBgNVBAYT
+AlVTMQ0wCwYDVQQIDARPaGlvMRQwEgYDVQQDDAt0ZXN0LXNlcnZlcjAeFw0yMDA5
+MjExNjU4MDFaFw00MDA5MTYxNjU4MDFaMDIxCzAJBgNVBAYTAlVTMQ0wCwYDVQQI
+DARPaGlvMRQwEgYDVQQDDAt0ZXN0LXNlcnZlcjB2MBAGByqGSM49AgEGBSuBBAAi
+A2IABEZRlI1rU5LKmNnUMmD8d0L8Qy9RuXxB+tMf9WoACqZ1XDDIFIQm8RglA1wv
+LUvncE7uhQEqhPtnlEZJBQnz73SBJvBkuTKfs326lKZBvmhHyqkRaHX1aQEQby3I
+Hvz3I6NTMFEwHQYDVR0OBBYEFIE1S8UpQFu+SxlMp8qoBu0F9b/1MB8GA1UdIwQY
+MBaAFIE1S8UpQFu+SxlMp8qoBu0F9b/1MA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZI
+zj0EAwIDaAAwZQIxANWNzzcRoBNsF5WpvUeCMmwLqa7yT5txH5A3wM3q9k75nQ8F
+euIrppUQahAZLVyHpAIwIuGUBsVMqBTKuzndV8D03wmswbHOLqkvEq0xaOjOhK0i
+yvH+Ns4DPPcayWW6hmii
-----END CERTIFICATE-----
diff --git a/opensaml-security-api/src/test/resources/data/ec-privkey-nopass.pem b/opensaml-security-api/src/test/resources/data/ec-privkey-nopass.pem
index be76db29d..1ebb237dc 100644
--- a/opensaml-security-api/src/test/resources/data/ec-privkey-nopass.pem
+++ b/opensaml-security-api/src/test/resources/data/ec-privkey-nopass.pem
@@ -1,8 +1,9 @@
-----BEGIN EC PARAMETERS-----
-BgUrgQQACg==
+BgUrgQQAIg==
-----END EC PARAMETERS-----
-----BEGIN EC PRIVATE KEY-----
-MHQCAQEEIB5bGSry81tj/mNMA+A+aZRQedk2ZwrXbQreuY+0PBe9oAcGBSuBBAAK
-oUQDQgAEtDz2EpX9q+m9hrPrva/HwscxNXMboGcghaHP0mtzrVdWqcCDlpu1vQXR
-vfkax/+l2srXqm+/4Ll5x2xLv108lg==
+MIGkAgEBBDCDU76xbzHM3Cgn2ihWY5SKeKnfi3vQNC1aYNivez2zj1fSActmtb2u
+NczbKjE5B9ygBwYFK4EEACKhZANiAARGUZSNa1OSypjZ1DJg/HdC/EMvUbl8QfrT
+H/VqAAqmdVwwyBSEJvEYJQNcLy1L53BO7oUBKoT7Z5RGSQUJ8+90gSbwZLkyn7N9
+upSmQb5oR8qpEWh19WkBEG8tyB789yM=
-----END EC PRIVATE KEY-----
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list