Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions assemblies/features/standard/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,9 @@ encryption.enabled = false

#
# Encryption Service name
# the default one is 'basic'
# a more powerful one named 'jasypt' is available
# when installing the encryption feature
# the default one is 'basic'. Note that this digests without salting.
# a more powerful one named 'jasypt' is available when installing the
# encryption feature
#
encryption.name = basic

Expand All @@ -683,7 +683,7 @@ encryption.suffix = {CRYPT}
# SHA-384
# SHA-512
#
encryption.algorithm = MD5
encryption.algorithm = SHA-256

#
# Encoding of the encrypted password.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ encryption.enabled = false

#
# Encryption Service name
# the default one is 'basic'
# a more powerful one named 'jasypt' is available
# when installing the encryption feature
# the default one is 'basic'. Note that this digests without salting.
# a more powerful one named 'jasypt' is available when installing the
# encryption feature
#
encryption.name = basic

Expand All @@ -50,7 +50,7 @@ encryption.suffix = {CRYPT}
# SHA-384
# SHA-512
#
encryption.algorithm = MD5
encryption.algorithm = SHA-256

#
# Encoding of the encrypted password.
Expand Down
8 changes: 4 additions & 4 deletions itests/test/src/test/filtered-resources/etc/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,9 @@

#
# Encryption Service name
# the default one is 'basic'
# a more powerful one named 'jasypt' is available
# when installing the encryption feature
# the default one is 'basic'. Note that this digests without salting.
# a more powerful one named 'jasypt' is available when installing the
# encryption feature
#
encryption.name = basic

Expand All @@ -471,7 +471,7 @@
# SHA-384
# SHA-512
#
encryption.algorithm = MD5
encryption.algorithm = SHA-256

#
# Encoding of the encrypted password.
Expand Down
12 changes: 7 additions & 5 deletions manual/src/main/asciidoc/user-guide/security.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,9 @@ encryption.enabled = false

#
# Encryption Service name
# the default one is 'basic'
# a more powerful one named 'jasypt' is available
# when installing the encryption feature
# the default one is 'basic'. Note that this digests without salting.
# a more powerful one named 'jasypt' is available when installing the
# encryption feature
#
encryption.name = basic

Expand All @@ -320,7 +320,7 @@ encryption.suffix = {CRYPT}
# SHA-384
# SHA-512
#
encryption.algorithm = MD5
encryption.algorithm = SHA-256

#
# Encoding of the encrypted password.
Expand All @@ -343,7 +343,9 @@ The `etc/org.apache.karaf.jaas.cfg` configuration file allows you to define adva
* the `encryption.prefix` property defines the prefix to "flag" a password as encrypted. The default is `\{CRYPT\`}.
* the `encryption.suffix` property defines the suffix to "flag" a password as encrypted. The default is `\{CRYPT\`}.
* the `encryption.algorithm` property defines the algorithm to use for encryption (digest). The possible values are `MD2`, `MD5`,
`SHA-1`, `SHA-256`, `SHA-384`, `SHA-512`. The default is `MD5`.
`SHA-1`, `SHA-256`, `SHA-384`, `SHA-512`. The default is `SHA-256` since Karaf 4.3.0, prior to this it was `MD5`. When the `basic` algorithm is used then the value is digested
using this algorithm without salting. For a more secure alternative which uses salts please consider using the `jasypt` encryption
algorithm instead.
* the `encryption.encoding` property defines the encoding of the encrypted password. The possible values are `hexadecimal`
or `base64`. The default value is `hexadecimal`.

Expand Down