[java-plugin-shibd-oidc] branch main updated: Improve credentials.xml file and property names

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-plugin-shibd-oidc.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-oidc/commit/027b3bd0f3c26b3375e7851b5dd8c6205c043f73

The following commit(s) were added to refs/heads/main by this push:
     new 027b3bd  Improve credentials.xml file and property names
027b3bd is described below

commit 027b3bd0f3c26b3375e7851b5dd8c6205c043f73
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Feb 23 17:50:11 2026 +0000

    Improve credentials.xml file and property names
---
 .../shibboleth/idp/module/conf/sp/oidc-credentials.xml   | 16 ++++------------
 .../net/shibboleth/idp/module/conf/sp/oidc.properties    |  4 ++--
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc-credentials.xml b/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc-credentials.xml
index 6e0bebc..71e0144 100644
--- a/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc-credentials.xml
+++ b/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc-credentials.xml
@@ -11,17 +11,9 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <!--
-    This defines the signing and encryption key and certificate pairs referenced by your agent/application
-    configuration. You don't normally need to touch this, unless you have advanced requirements such as
-    supporting multiple sets of keys for different IdPs, in which case you may want to define all your
-    credentials here for convenience and reference them as needed.
-    -->
-
     
      <!--
-    This file contains default OIDC signing credentials. This file should be imported into credentials.xml.
+    This file contains default OIDC signing and encryption credentials. This file should be imported into agents.xml.
     -->
     
     <bean id="shibboleth.oidc.DefaultRSSigningCredential" parent="shibboleth.oidc.JWKCredential"
@@ -31,10 +23,10 @@
         p:resource="%{sp.oidc.signing.es.key:#{null}}" p:throwIfNull="false" />
 
     <bean id="shibboleth.oidc.DefaultRSAEncryptionCredential" parent="shibboleth.oidc.JWKCredential"
-        p:resource="%{sp.oidc.signing.rsa.enc.key:#{null}}" p:throwIfNull="false" />
+        p:resource="%{sp.oidc.encryption.rsa.key:#{null}}" p:throwIfNull="false" />
 
     <!--
-    Lists ALL of your OP's response signing credentials for the default security configuration. 
+    Lists ALL of your RP's signing credentials for the default security configuration. 
     If you define additional signing credentials make sure to include them within this list.
     -->
     <util:list id="shibboleth.oidc.SigningCredentials">
@@ -43,7 +35,7 @@
     </util:list>
 
     <!--
-    Lists ALL of your OP's request decryption credentials for the default security configuration.
+    Lists ALL of your RP's token decryption credentials for the default security configuration.
     If you  define additional decryption credentials make sure to include them within this list.
     -->
     <util:list id="shibboleth.oidc.EncryptionCredentials">
diff --git a/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc.properties b/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc.properties
index 4581381..41fb517 100644
--- a/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc.properties
+++ b/sp-oidc-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/oidc.properties
@@ -4,10 +4,10 @@
 #sp.oidc.defaultClientSecret =
 
 # TODO key rollover
-## Signing and encryption/decryption keys for request objects, id tokens, and userinfo response
+## Signing and encryption/decryption keys for request objects, id tokens, client authentication, and userinfo response
 #sp.oidc.signing.rs.key = %{idp.home}/credentials/sp/sp-signing-rs.jwk
 #sp.oidc.signing.es.key = %{idp.home}/credentials/sp/sp-signing-es.jwk
-#sp.oidc.signing.rsa.enc.key = %{idp.home}/credentials/sp/sp-encryption-rsa.jwk
+#sp.oidc.encryption.rsa.key = %{idp.home}/credentials/sp/sp-encryption-rsa.jwk
 
 # The OP's keyset document fetch interval i.e. how long should keys from the OP be cached.
 #sp.oidc.keyfetch.interval = PT30M

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.