[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
  discards  c07d297640a2bb488b3480262ca8f1032b96258c (commit)
       via  27feda04 Call `OpenSSL_add_all_algorithms()` on older openssl versions.
       via  bf96cd31 Init the checksum choices before the daemon auth.
      from  c07d2976 Init the checksum choices before the daemon auth.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 27feda0436e39e04ae53e08247739f8b6c906d56
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Oct 25 09:02:05 2022 -0700

    Call `OpenSSL_add_all_algorithms()` on older openssl versions.

commit bf96cd314c29c042a28399beac2c8b63b957967f
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Oct 25 08:55:07 2022 -0700

    Init the checksum choices before the daemon auth.

-----------------------------------------------------------------------

Summary of changes:
 checksum.c | 6 +++++-
 compat.c   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/checksum.c b/checksum.c
index 60de3655..c6007f36 100644
--- a/checksum.c
+++ b/checksum.c
@@ -154,7 +154,7 @@ static const EVP_MD *csum_evp_md(struct name_num_item *nni)
 		emd = NULL;
 	else
 #endif
-		emd = EVP_get_digestbyname(nni->name);                                               
+		emd = EVP_get_digestbyname(nni->name);
 	if (emd && !(nni->flags & NNI_EVP_OK)) { /* Make sure it works before we advertise it */
 		if (!ctx_evp && !(ctx_evp = EVP_MD_CTX_create()))
 			out_of_memory("csum_evp_md");
@@ -787,6 +787,10 @@ void init_checksum_choices()
 	if (initialized_choices)
 		return;
 
+#if defined USE_OPENSSL && OPENSSL_VERSION_NUMBER < 0x10100000L
+	OpenSSL_add_all_algorithms();
+#endif
+
 #if defined SUPPORT_XXH3 || defined USE_OPENSSL
 	for (nni = valid_checksums.list; nni->name; nni++)
 		verify_digest(nni, True);
diff --git a/compat.c b/compat.c
index 25bbe0fb..4ce8c6d0 100644
--- a/compat.c
+++ b/compat.c
@@ -834,6 +834,8 @@ void output_daemon_greeting(int f_out, int am_client)
 	char tmpbuf[MAX_NSTR_STRLEN];
 	int our_sub = get_subprotocol_version();
 
+	init_checksum_choices();
+
 	get_default_nno_list(&valid_auth_checksums, tmpbuf, MAX_NSTR_STRLEN, '\0');
 
 	io_printf(f_out, "@RSYNCD: %d.%d %s\n", protocol_version, our_sub, tmpbuf);
@@ -848,8 +850,6 @@ void negotiate_daemon_auth(int f_out, int am_client)
 	int save_am_server = am_server;
 	int md4_is_old = 0;
 
-	init_checksum_choices();
-
 	if (!am_client)
 		am_server = 1;
 


-- 
The rsync repository.