feat(jans-ce-setup): extending crypto support, sub pr4; #142; (#669)

JanssenProject · Jan 24, 2022 · b8fda09 · b8fda09
1 parent 9426517
commit b8fda09
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/jans-ce-setup/setup_app/config.py b/jans-ce-setup/setup_app/config.py
@@ -293,7 +293,7 @@ def progress(self, service_name, msg, incr=False):
 
         # OpenID key generation default setting
         self.default_openid_jks_dn_name = 'CN=Jans Auth CA Certificates'
-        self.default_sig_key_algs = 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 Ed25519 Ed448'
+        self.default_sig_key_algs = 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 EdDSA'
         self.default_enc_key_algs = 'RSA1_5 RSA-OAEP ECDH-ES'
         self.default_key_expiration = 365
 

diff --git a/jans-ce-setup/setup_app/installers/jans_auth.py b/jans-ce-setup/setup_app/installers/jans_auth.py
@@ -65,7 +65,7 @@ def generate_configuration(self):
             Config.encoded_admin_password = self.ldap_encode(Config.admin_password)
 
         self.logIt("Generating OAuth openid keys", pbar=self.service_name)
-        sig_keys = 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 Ed25519 Ed448'
+        sig_keys = 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 EdDSA'
         enc_keys = 'RSA1_5 RSA-OAEP ECDH-ES'
         jwks = self.gen_openid_jwks_jks_keys(self.oxauth_openid_jks_fn, Config.oxauth_openid_jks_pass, key_expiration=2, key_algs=sig_keys, enc_keys=enc_keys)
         self.write_openid_keys(self.oxauth_openid_jwks_fn, jwks)

diff --git a/jans-ce-setup/static/scripts/key_regeneration.py b/jans-ce-setup/static/scripts/key_regeneration.py
@@ -31,10 +31,10 @@
 oxauth_keys_json_fn = 'jans-keys.json'
 
 algs_for_versions = {
-    '1.0.0': {'sig_keys': 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 Ed25519 Ed448', 'enc_keys': 'RSA1_5 RSA-OAEP ECDH-ES'},
+    '1.0.0': {'sig_keys': 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 EdDSA', 'enc_keys': 'RSA1_5 RSA-OAEP ECDH-ES'},
 }
 
-sig_keys = 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 Ed25519 Ed448'
+sig_keys = 'RS256 RS384 RS512 ES256 ES256K ES384 ES512 PS256 PS384 PS512 EdDSA'
 enc_keys = 'RSA1_5 RSA-OAEP ECDH-ES'