Merge branch 'stable-2.14' into stable-2.15
* stable-2.14: Documentation: Remove references to optional BouncyCastle libraries Change-Id: I7a0a6063b96a8655630754c4e3a62d2dd4578c66
This commit is contained in:
commit
a625c0fc18
@ -4339,8 +4339,6 @@ Supported key exchange algorithms:
|
||||
* `diffie-hellman-group1-sha1`
|
||||
|
||||
By default, all supported key exchange algorithms are available.
|
||||
Without Bouncy Castle, `diffie-hellman-group1-sha1` is the only
|
||||
available algorithm.
|
||||
|
||||
It is strongly recommended to disable at least `diffie-hellman-group1-sha1`
|
||||
as it's known to be vulnerable (logjam attack). Additionally, if your setup
|
||||
|
@ -175,8 +175,8 @@ link:install-j2ee.html[J2EE installation].
|
||||
[[installation_on_windows]]
|
||||
== Installation on Windows
|
||||
|
||||
If new site is going to be initialized with Bouncy Castle cryptography,
|
||||
ssh-keygen command must be available during the init phase. If you have
|
||||
The `ssh-keygen` command must be available during the init phase to
|
||||
generate SSH host keys. If you have
|
||||
link:https://git-for-windows.github.io/[Git for Windows] installed,
|
||||
start Command Prompt and temporary add directory with ssh-keygen to the
|
||||
PATH environment variable just before running init command:
|
||||
|
Loading…
x
Reference in New Issue
Block a user