diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
index 5c0cbb34a..e5c479df6 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
@@ -37,7 +37,23 @@
"contacts": "Kontakter",
"contacts-placeholder": "new contact",
"credentials": "Credentials",
- "crypto": "Crypto",
+ "crypto": {
+ "a128cbc-hs256": "Composite Authenticated Encryption algorithm using AES in Cipher Block Chaining (CBC) mode with PKCS #5 padding with an integrity calculation using HMAC SHA-256, using a 256 bit CMK (and 128 bit CEK)",
+ "a256cbc-hs512": "Composite Authenticated Encryption algorithm using AES in CBC mode with PKCS #5 padding with an integrity calculation using HMAC SHA-512, using a 512 bit CMK (and 256 bit CEK)",
+ "a128gcm": "AES GCM using 128 bit keys",
+ "a256gcm": "AES GCM using 256 bit keys",
+ "a128kw": "AES Key Wrap Algorithm using 128 bit keys",
+ "a256kw": "AES Key Wrap Algorithm using 256 bit keys",
+ "default": "Use server default",
+ "dir": "Direct use of a shared symmetric key as the Content Master Key (CMK) for the block encryption step",
+ "ecdh-es": "Elliptic Curve Diffie-Hellman Ephemeral Static key agreement using the Concat KDF, with the agreed-upon key being used directly as the Content Master Key",
+ "ecdh-es-a128kw": "Elliptic Curve Diffie-Hellman Ephemeral Static key agreement per ECDH-ES and Section 4.7, but where the agreed-upon key is used to wrap the Content Master Key (CMK) with the A128KW function",
+ "ecdh-es-a256kw": "Elliptic Curve Diffie-Hellman Ephemeral Static key agreement per ECDH-ES and Section 4.7, but where the agreed-upon key is used to wrap the Content Master Key (CMK) with the A256KW function",
+ "none": "No encryption",
+ "rsa-oaep": "RSAES using Optimal Asymmetric Encryption Padding (OAEP)",
+ "rsa1-5": "RSAES-PKCS1-V1_5"
+ },
+ "cryptography": "Crypto",
"display-secret": "Display/edit client secret:",
"edit": "Edit Client",
"generate-new-secret": "Generate a new client secret?",
@@ -47,6 +63,9 @@
"home": "Home Page",
"home-help": "URL for the client's home page, will be displayed to the user",
"hours": "hours",
+ "id-token-crypto-algorithm": "ID Token Encryption Algorithm",
+ "id-token-crypto-method": "ID Token Encryption Method",
+ "id-token-signing-algorithm": "ID Token Signing Algorithm",
"id-token-timeout": "ID Token Timeout",
"implicit": "implicit",
"introspection": "Introspection",
@@ -80,18 +99,20 @@
"secret-post": "Client Secret over HTTP POST",
"secret-symmetric-jwt": "Client Secret via symmetrically-signed JWT assertion",
"sector-identifier": "Sector Identifier URI",
- "signing-any": "Any allowed",
- "signing-default": "Use server default",
- "signing-ecdsa-256": "ECDSA using P-256 curve and SHA-256 hash algorithm",
- "signing-ecdsa-384": "ECDSA using P-384 curve and SHA-384 hash algorithm",
- "signing-ecdsa-512": "ECDSA using P-512 curve and SHA-512 hash algorithm",
- "signing-hmac-256": "HMAC using SHA-256 hash algorithm",
- "signing-hmac-384": "HMAC using SHA-384 hash algorithm",
- "signing-hmac-512": "HMAC using SHA-512 hash algorithm",
- "signing-none": "No digital signature",
- "signing-rsassa-256": "RSASSA using SHA-256 hash algorithm",
- "signing-rsassa-384": "RSASSA using SHA-384 hash algorithm",
- "signing-rsassa-512": "RSASSA using SHA-512 hash algorithm",
+ "signing": {
+ "any": "Any allowed",
+ "default": "Use server default",
+ "ecdsa-256": "ECDSA using P-256 curve and SHA-256 hash algorithm",
+ "ecdsa-384": "ECDSA using P-384 curve and SHA-384 hash algorithm",
+ "ecdsa-512": "ECDSA using P-512 curve and SHA-512 hash algorithm",
+ "hmac-256": "HMAC using SHA-256 hash algorithm",
+ "hmac-384": "HMAC using SHA-384 hash algorithm",
+ "hmac-512": "HMAC using SHA-512 hash algorithm",
+ "none": "No digital signature",
+ "rsassa-256": "RSASSA using SHA-256 hash algorithm",
+ "rsassa-384": "RSASSA using SHA-384 hash algorithm",
+ "rsassa-512": "RSASSA using SHA-512 hash algorithm"
+ },
"subject-type": "Subject Type",
"terms": "Terms of Service",
"terms-help": "URL for the Terms of Service of this client, will be displayed to the user",
@@ -100,6 +121,8 @@
"type": "Application Type",
"type-native": "Native",
"type-web": "Web",
+ "user-info-crypto-algorithm": "User Info Endpoint Encryption Algorithm",
+ "user-info-crypto-method": "User Info Endpoint Encryption Method",
"user-info-signing-algorithm": "User Info Endpoint Signing Algorithm"
},
"client-table": {
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
index f0daa4462..0792d4df9 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
@@ -38,7 +38,23 @@
"contacts": "Kontakter",
"contacts-placeholder": "ny kontakt",
"credentials": "Hemligheter",
- "crypto": "Krypto",
+ "crypto": {
+ "a128cbc-hs256": "Composite Authenticated Encryption algorithm using AES in Cipher Block Chaining (CBC) mode with PKCS #5 padding with an integrity calculation using HMAC SHA-256, using a 256 bit CMK (and 128 bit CEK)",
+ "a128gcm": "AES GCM using 128 bit keys",
+ "a128kw": "AES Key Wrap algoritm med 128-bitars nycklar",
+ "a256cbc-hs512": "Composite Authenticated Encryption algorithm using AES in CBC mode with PKCS #5 padding with an integrity calculation using HMAC SHA-512, using a 512 bit CMK (and 256 bit CEK)",
+ "a256gcm": "AES GCM using 256 bit keys",
+ "a256kw": "AES Key Wrap algoritm med 256-bitars nycklar",
+ "default": "Använd serverns standard-algoritm",
+ "dir": "Direct use of a shared symmetric key as the Content Master Key (CMK) for the block encryption step",
+ "ecdh-es": "Elliptic Curve Diffie-Hellman Ephemeral Static key agreement using the Concat KDF, with the agreed-upon key being used directly as the Content Master Key",
+ "ecdh-es-a128kw": "Elliptic Curve Diffie-Hellman Ephemeral Static key agreement per ECDH-ES and Section 4.7, but where the agreed-upon key is used to wrap the Content Master Key (CMK) with the A128KW function",
+ "ecdh-es-a256kw": "Elliptic Curve Diffie-Hellman Ephemeral Static key agreement per ECDH-ES and Section 4.7, but where the agreed-upon key is used to wrap the Content Master Key (CMK) with the A256KW function",
+ "none": "Ingen kryptering",
+ "rsa-oaep": "RSAES med Optimal Asymmetric Encryption Padding (OAEP)",
+ "rsa1-5": "RSAES-PKCS1-V1_5"
+ },
+ "cryptography": "Kryptografi",
"display-secret": "Visa/editera klientens hemlighet:",
"edit": "Ändra klient",
"generate-new-secret": "Generera en ny klienthemlighet?",
@@ -48,6 +64,9 @@
"home": "Hemsida",
"home-help": "Länk till tjänstens hemsida. Den kommer att visas på bekräftelsesidan.",
"hours": "timmar",
+ "id-token-crypto-algorithm": "Krypteringsalgoritm för ID-token",
+ "id-token-crypto-method": "Krypteringsmetod för ID-token",
+ "id-token-signing-algorithm": "Signeringsalgoritm för ID-token",
"id-token-timeout": "Livslängd för ID-token",
"implicit": "implicit",
"introspection": "Introspektion",
@@ -81,18 +100,20 @@
"secret-symmetric-jwt": "Klienthemlighet via symmetriskt signerad JWT assertion",
"sector-identifier": "Sector Identifier-länk",
"sector-identifier-help": "Sector Identifier för JavaScript.",
- "signing-any": "Valfri tillåten",
- "signing-default": "Använd serverns standard-algoritm",
- "signing-ecdsa-256": "ECDSA med P-256 kurva och SHA-256 hash-algoritm",
- "signing-ecdsa-384": "ECDSA med P-384 kurva och SHA-384 hash-algoritm",
- "signing-ecdsa-512": "ECDSA med P-512 kurva och SHA-512 hash-algoritm",
- "signing-hmac-256": "HMAC med SHA-256 hash-algoritm",
- "signing-hmac-384": "HMAC med SHA-384 hash-algoritm",
- "signing-hmac-512": "HMAC med SHA-512 hash-algoritm",
- "signing-none": "Ingen digital signatur",
- "signing-rsassa-256": "RSASSA med SHA-256 hash-algoritm",
- "signing-rsassa-384": "RSASSA med SHA-384 hash-algoritm",
- "signing-rsassa-512": "RSASSA med SHA-512 hash-algoritm",
+ "signing": {
+ "any": "Valfri tillåten",
+ "default": "Använd serverns standard-algoritm",
+ "es256": "ECDSA med P-256-kurva och SHA-256 hash-algoritm",
+ "es384": "ECDSA med P-384-kurva och SHA-384 hash-algoritm",
+ "es512": "ECDSA med P-512-kurva och SHA-512 hash-algoritm",
+ "hs256": "HMAC med SHA-256 hash-algoritm",
+ "hs384": "HMAC med SHA-384 hash-algoritm",
+ "hs512": "HMAC med SHA-512 hash-algoritm",
+ "none": "Ingen digital signatur",
+ "rs256": "RSASSA med SHA-256 hash-algoritm",
+ "rs384": "RSASSA med SHA-384 hash-algoritm",
+ "rs512": "RSASSA med SHA-512 hash-algoritm"
+ },
"subject-type": "Subjekttyp",
"terms": "Villkor för tjänsten",
"terms-help": "Länk till en sida som beskriver villkor för tjänsten. Den visas på bekräftelsesidan.",
@@ -102,6 +123,8 @@
"type": "Typ av tjänst",
"type-native": "App",
"type-web": "Webb",
+ "user-info-crypto-algorithm": "Krypteringsalgoritm för user-info",
+ "user-info-crypto-method": "Krypteringsmetod för user-info",
"user-info-signing-algorithm": "Signeringsalgoritm för user-info"
},
"client-table": {
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
index a4bb4cbdd..872a5f7dc 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
@@ -185,7 +185,7 @@