saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix master default publish_signing_algorithm

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-05-25 15:55:23 -07:00 • committed by Daniel Wozniak
parent 7eb4fb6cd3
commit f6a880a2f1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/config/__init__.py
View file

@ -1658,7 +1658,7 @@ DEFAULT_MASTER_OPTS = immutabletypes.freeze(
"maintenance_interval": 3600,
"fileserver_interval": 3600,
"features": {},
"publish_signing_algorithm": "PKCS1v15-SHA224",
"publish_signing_algorithm": "PKCS1v15-SHA1",
}
)

1
tests/pytests/functional/transport/server/conftest.py
View file

@ -19,6 +19,7 @@ def salt_master(salt_factories, transport):
"transport": transport,
"auto_accept": True,
"sign_pub_messages": False,
"publish_signing_algorithm": "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1",
}
factory = salt_factories.salt_master_daemon(
random_string(f"server-{transport}-master-"),