Mercurial > hg > dav / file diff

--- a/test/crypto.c	Wed Jan 07 22:23:43 2026 +0100
+++ b/test/crypto.c	Wed Jan 07 22:31:05 2026 +0100
@@ -214,8 +214,8 @@
                 char *s128 = util_decrypt_str_k(sn, c1, &keys128[k]);
                 char *s256 = util_decrypt_str_k(sn, c2, &keys256[k]);
 
-                CX_TEST_ASSERTMM(!strcmp(s128, strings[i]), "s128 wrong");
-                CX_TEST_ASSERTMM(!strcmp(s256, strings[i]), "s256 wrong");
+                CX_TEST_ASSERTM(!strcmp(s128, strings[i]), "s128 wrong");
+                CX_TEST_ASSERTM(!strcmp(s256, strings[i]), "s256 wrong");
             }
         }
     
@@ -238,8 +238,8 @@
                 char *dec1 = util_decrypt_str_k(sn, aes128, &keys128[k]);
                 char *dec2 = util_decrypt_str_k(sn, aes256, &keys256[k]);
 
-                CX_TEST_ASSERTMM(!strcmp(dec1, strings[i]), "aes128 encrypt failed");
-                CX_TEST_ASSERTMM(!strcmp(dec2, strings[i]), "aes256 encrypt failed");
+                CX_TEST_ASSERTM(!strcmp(dec1, strings[i]), "aes128 encrypt failed");
+                CX_TEST_ASSERTM(!strcmp(dec2, strings[i]), "aes256 encrypt failed");
             }
         }
     
@@ -258,20 +258,20 @@
                 content->pos = 0;
 
                 CxBuffer *enc = aes_encrypt_buffer(content, key);
-                CX_TEST_ASSERTMM(enc->size >= content->size + 16, "aes_encrypt_buffer failed");
+                CX_TEST_ASSERTM(enc->size >= content->size + 16, "aes_encrypt_buffer failed");
 
                 char *base64 = util_base64encode(enc->space, enc->size);
                 size_t plainlen = 0;
                 char *plain = aes_decrypt(base64, &plainlen, key);
 
-                CX_TEST_ASSERTMM(plain, "aes_decrypt failed");
-                CX_TEST_ASSERTMM(plainlen == content->size, "aes_decrypt: wrong length");
-                CX_TEST_ASSERTMM(!memcmp(plain, content->space, plainlen), "aes_decrypt: wrong content");
+                CX_TEST_ASSERTM(plain, "aes_decrypt failed");
+                CX_TEST_ASSERTM(plainlen == content->size, "aes_decrypt: wrong length");
+                CX_TEST_ASSERTM(!memcmp(plain, content->space, plainlen), "aes_decrypt: wrong content");
 
                 CxBuffer *dec = aes_decrypt_buffer(enc, key);
-                CX_TEST_ASSERTMM(dec->size == content->size, "aes_decrypt_buffer failed");
+                CX_TEST_ASSERTM(dec->size == content->size, "aes_decrypt_buffer failed");
 
-                CX_TEST_ASSERTMM(!memcmp(content->space, dec->space, dec->size), "decrypted buffer has wrong content");
+                CX_TEST_ASSERTM(!memcmp(content->space, dec->space, dec->size), "decrypted buffer has wrong content");
 
                 cxBufferFree(content);
                 cxBufferFree(enc);
@@ -318,15 +318,15 @@
                 aes_decrypter_shutdown(dec);
                 aes_decrypter_close(dec);
 
-                CX_TEST_ASSERTMM(slen == pbuf->pos, "wrong length after enc-dec");
-                CX_TEST_ASSERTMM(!memcmp(strings[j], pbuf->space, slen), "wrong content after enc-dec");
+                CX_TEST_ASSERTM(slen == pbuf->pos, "wrong length after enc-dec");
+                CX_TEST_ASSERTM(!memcmp(strings[j], pbuf->space, slen), "wrong content after enc-dec");
 
                 data->pos = 0;
                 CxBuffer *enc2 = aes_encrypt_buffer(data, key);
                 CxBuffer *dec2 = aes_decrypt_buffer(enc2, key);
 
-                CX_TEST_ASSERTMM(dec2->size == data->size, "dec2 has wrong size");
-                CX_TEST_ASSERTMM(!memcmp(strings[j], dec2->space, dec2->size), "dec2 has wrong content");
+                CX_TEST_ASSERTM(dec2->size == data->size, "dec2 has wrong size");
+                CX_TEST_ASSERTM(!memcmp(strings[j], dec2->space, dec2->size), "dec2 has wrong content");
             }
         }
     
@@ -456,9 +456,9 @@
                     int index = 16*p + 4*s + i;
                     int keylen = index % 2 == 0 ? 16 : 32;
 
-                    CX_TEST_ASSERTMM(key, "no key");
-                    CX_TEST_ASSERTMM(keylen == key->length, "wrong key length");
-                    CX_TEST_ASSERTMM(!memcmp(key->data, pwgenkeys[index], keylen), "wrong key data");
+                    CX_TEST_ASSERTM(key, "no key");
+                    CX_TEST_ASSERTM(keylen == key->length, "wrong key length");
+                    CX_TEST_ASSERTM(!memcmp(key->data, pwgenkeys[index], keylen), "wrong key data");
                 }
             }
         }