Merge branch 'main' into ha.mfa

Author: ekoby

library/utils.c

@@ -561,6 +561,10 @@ int load_key_internal(tls_context *tls, tlsuv_private_key_t *key, const char *ke
     }
 
     if (strncmp(keystr, "keychain:", strlen("keychain:")) == 0) {
+        if (tls->load_keychain_key == NULL) {
+            ZITI_LOG(ERROR, "keychain is not supported and config appears to be copied from a system that supports it");
+            return ZITI_INVALID_CONFIG;
+        }
         const char *keyname = strchr(keystr, ':') + 1;
         rc = tls->load_keychain_key(key, keyname);
         if (rc != 0) {
@@ -684,4 +688,4 @@ uint64_t next_backoff(int *count, int max, uint64_t base) {
 
     *count = c;
     return random % ((1U << backoff) * base);
-}
+}