[guacamole-server] branch master updated (5dbf4820 -> 0361adc0)

[mj...@apache.org]

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

mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git


    from 5dbf4820 Merge 1.5.0 changes back to master.
     add 1971a9da GUACAMOLE-1669: Prefer FIPS compliant ciphers and algorithms when FIPS mode is enabled.
     new 0361adc0 GUACAMOLE-1669: Merge FIPS support for SSH connections.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/common-ssh/ssh.c                            | 23 +++++++++++
 src/libguac/Makefile.am                         |  4 +-
 src/libguac/fips.c                              | 51 +++++++++++++++++++++++++
 src/libguac/guacamole/{layer-types.h => fips.h} | 20 +++++-----
 4 files changed, 86 insertions(+), 12 deletions(-)
 create mode 100644 src/libguac/fips.c
 copy src/libguac/guacamole/{layer-types.h => fips.h} (75%)

[guacamole-server] 01/01: GUACAMOLE-1669: Merge FIPS support for SSH connections.

[mj...@apache.org]

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

mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 0361adc01f1305d0a5d46885e353e458eca4bddf
Merge: 5dbf4820 1971a9da
Author: Mike Jumper <mj...@apache.org>
AuthorDate: Wed Aug 24 15:29:46 2022 -0700

    GUACAMOLE-1669: Merge FIPS support for SSH connections.

 src/common-ssh/ssh.c         | 23 ++++++++++++++++++++
 src/libguac/Makefile.am      |  4 +++-
 src/libguac/fips.c           | 51 ++++++++++++++++++++++++++++++++++++++++++++
 src/libguac/guacamole/fips.h | 33 ++++++++++++++++++++++++++++
 4 files changed, 110 insertions(+), 1 deletion(-)