This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 02be2cdf67d0371e14511ffb8919fc65c8aca734 Merge: fbb9dec6e5c 8e171785d1b Author: Daan Hoogland <[email protected]> AuthorDate: Wed Jul 5 11:52:23 2023 +0200 Merge release branch 4.18 to main * 4.18: cleanup removal of physical network (#7630) console proxy: use AeadBase64Encryptor instead of AES/CBC/PKCS5Padding (#7237) .../java/com/cloud/network/NetworkServiceImpl.java | 69 ++++++++++++------- .../ConsoleProxyPasswordBasedEncryptor.java | 71 ++------------------ .../ConsoleProxyPasswordBasedEncryptor.java | 78 ++-------------------- .../com/cloud/utils/crypt/AeadBase64Encryptor.java | 13 +++- 4 files changed, 69 insertions(+), 162 deletions(-)
