-exim_sha_update(h, conn_args->sending_ip_address, Ustrlen(conn_args->sending_ip_address));
-if (openssl_options)
- exim_sha_update(h, openssl_options, Ustrlen(openssl_options));
-if (ob->tls_require_ciphers)
- exim_sha_update(h, ob->tls_require_ciphers, Ustrlen(ob->tls_require_ciphers));
-if (tlsp->sni)
- exim_sha_update(h, tlsp->sni, Ustrlen(tlsp->sni));
-#ifdef EXIM_HAVE_ALPN
-if (ob->tls_alpn)
- exim_sha_update(h, ob->tls_alpn, Ustrlen(ob->tls_alpn));
-#endif
+exim_sha_update_string(h, conn_args->sending_ip_address);
+exim_sha_update_string(h, openssl_options);
+exim_sha_update_string(h, ob->tls_require_ciphers);
+exim_sha_update_string(h, tlsp->sni);
+# ifdef EXIM_HAVE_ALPN
+exim_sha_update_string(h, ob->tls_alpn);
+# endif