diff -r a569148841ff -r efbd59642577 test/crypto.c
--- a/test/crypto.c	Sun Apr 16 14:12:24 2023 +0200
+++ b/test/crypto.c	Fri Apr 21 21:25:32 2023 +0200
@@ -33,9 +33,9 @@
 
 #include "crypto.h"
 
-#include <ucx/string.h>
-#include <ucx/utils.h>
-#include <ucx/buffer.h>
+#include <cx/string.h>
+#include <cx/utils.h>
+#include <cx/buffer.h>
 #include <libidav/utils.h>
 #include <libidav/crypto.h>
 
@@ -254,11 +254,11 @@
         DavKey *key = i < 16 ? &keys256[i] : &keys128[i%16];
         
         for(int j=0;j<20;j++) {
-            UcxBuffer *content = ucx_buffer_new(NULL, 256, UCX_BUFFER_AUTOEXTEND);
-            ucx_buffer_puts(content, strings[j]);
+            CxBuffer *content = cxBufferCreate(NULL, 256, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
+            cxBufferPutString(content, strings[j]);
             content->pos = 0;
             
-            UcxBuffer *enc = aes_encrypt_buffer(content, key);
+            CxBuffer *enc = aes_encrypt_buffer(content, key);
             UCX_TEST_ASSERT(enc->size >= content->size + 16, "aes_encrypt_buffer failed");
             
             char *base64 = util_base64encode(enc->space, enc->size);
@@ -269,14 +269,14 @@
             UCX_TEST_ASSERT(plainlen == content->size, "aes_decrypt: wrong length");
             UCX_TEST_ASSERT(!memcmp(plain, content->space, plainlen), "aes_decrypt: wrong content");
             
-            UcxBuffer *dec = aes_decrypt_buffer(enc, key);
+            CxBuffer *dec = aes_decrypt_buffer(enc, key);
             UCX_TEST_ASSERT(dec->size == content->size, "aes_decrypt_buffer failed");
             
             UCX_TEST_ASSERT(!memcmp(content->space, dec->space, dec->size), "decrypted buffer has wrong content");
             
-            ucx_buffer_free(content);
-            ucx_buffer_free(enc);
-            ucx_buffer_free(dec);
+            cxBufferFree(content);
+            cxBufferFree(enc);
+            cxBufferFree(dec);
             free(base64);
             free(plain);
         }
@@ -286,9 +286,9 @@
 }
 
 UCX_TEST(test_crypto_stream) {
-    UcxBuffer *data = ucx_buffer_new(NULL, 1024, UCX_BUFFER_AUTOEXTEND);
-    UcxBuffer *cbuf = ucx_buffer_new(NULL, 1024, UCX_BUFFER_AUTOEXTEND);
-    UcxBuffer *pbuf = ucx_buffer_new(NULL, 1024, UCX_BUFFER_AUTOEXTEND);
+    CxBuffer *data = cxBufferCreate(NULL, 1024, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
+    CxBuffer *cbuf = cxBufferCreate(NULL, 1024, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
+    CxBuffer *pbuf = cxBufferCreate(NULL, 1024, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
     
     UCX_TEST_BEGIN;
     
@@ -298,23 +298,23 @@
             data->pos = 0;
             data->size = 0;
             size_t slen = strlen(strings[j]);
-            ucx_buffer_write(strings[j], 1, slen, data);
-            ucx_buffer_seek(data, 0, SEEK_SET);
+            cxBufferWrite(strings[j], 1, slen, data);
+            cxBufferSeek(data, 0, SEEK_SET);
 
             cbuf->pos = 0;
             cbuf->size = 0;
             pbuf->pos = 0;
             pbuf->size = 0;
 
-            AESEncrypter *enc = aes_encrypter_new(key, data, (dav_read_func)ucx_buffer_read, NULL);
+            AESEncrypter *enc = aes_encrypter_new(key, data, (dav_read_func)cxBufferRead, NULL);
             char buf[1024];
             size_t r = 0;
             while((r = aes_read(buf, 1, 1024, enc)) != 0) {
-                ucx_buffer_write(buf, 1, r, cbuf);
+                cxBufferWrite(buf, 1, r, cbuf);
             }
             aes_encrypter_close(enc);
 
-            AESDecrypter *dec = aes_decrypter_new(key, pbuf, (dav_write_func)ucx_buffer_write);
+            AESDecrypter *dec = aes_decrypter_new(key, pbuf, (dav_write_func)cxBufferWrite);
             aes_write(cbuf->space, 1, cbuf->pos, dec);
             aes_decrypter_shutdown(dec);
             aes_decrypter_close(dec);
@@ -323,8 +323,8 @@
             UCX_TEST_ASSERT(!memcmp(strings[j], pbuf->space, slen), "wrong content after enc-dec");
             
             data->pos = 0;
-            UcxBuffer *enc2 = aes_encrypt_buffer(data, key);
-            UcxBuffer *dec2 = aes_decrypt_buffer(enc2, key);
+            CxBuffer *enc2 = aes_encrypt_buffer(data, key);
+            CxBuffer *dec2 = aes_decrypt_buffer(enc2, key);
             
             UCX_TEST_ASSERT(dec2->size == data->size, "dec2 has wrong size");
             UCX_TEST_ASSERT(!memcmp(strings[j], dec2->space, dec2->size), "dec2 has wrong content");