[karaf] branch karaf-4.2.x updated: [KARAF-6357] Use basic encryption by default

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 35ed50b  [KARAF-6357] Use basic encryption by default
35ed50b is described below

commit 35ed50b8702258928cc89e6b5fbc9698ef0c3fcb
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Tue Jan 14 08:09:43 2020 +0100

    [KARAF-6357] Use basic encryption by default
    
    (cherry picked from commit 042efcc5e1a5f13cc00c0375bf3f97288cc29a0b)
---
 .../src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java
index 9e2a8aa..8feff9e 100644
--- 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java
+++ 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java
@@ -64,7 +64,6 @@ public class Activator extends BaseActivator implements 
ManagedService {
         props.put("name", "basic");
         register(EncryptionService.class, new BasicEncryptionService(), props);
 
-
         Map<String, Object> config = getConfig();
 
         karafRealm = new KarafRealm(bundleContext, config);
@@ -101,7 +100,7 @@ public class Activator extends BaseActivator implements 
ManagedService {
     private Map<String, Object> getConfig() {
         Map<String, Object> config = new HashMap<>();
         populate(config, "detailed.login.exception", "false");
-        populate(config, ENCRYPTION_NAME, "");
+        populate(config, ENCRYPTION_NAME, "basic");
         populate(config, ENCRYPTION_ENABLED, "false");
         populate(config, ENCRYPTION_PREFIX, "{CRYPT}");
         populate(config, ENCRYPTION_SUFFIX, "{CRYPT}");