math/mpx-mul4-*.S: Use more portable type syntax for ambiguous instructions.

[catacomb] / symm / rc4.c

diff --git a/symm/rc4.c b/symm/rc4.c
index 0d02062..4cb0e87 100644 (file)
--- a/symm/rc4.c
+++ b/symm/rc4.c
@@ -122,7 +122,7 @@ void rc4_encrypt(rc4_ctx *ctx, const void *src, void *dest, size_t sz)
   octet *d = dest;
 
   if (!d)
-    RC4_OPEN(ctx, while (sz) { unsigned x; RC4_BYTE(x); sz--; });
+    RC4_OPEN(ctx, while (sz) { unsigned x; RC4_BYTE(x); (void)x; sz--; });
   else if (!s)
     RC4_OPEN(ctx, while (sz) { RC4_BYTE(*d++); sz--; });
   else
@@ -267,7 +267,7 @@ static const grand_ops grops = {
   "rc4",
   GRAND_CRYPTO, 0,
   grmisc, grdestroy,
-  grword, grbyte, grword, grand_range, grfill
+  grword, grbyte, grword, grand_defaultrange, grfill
 };
 
 /* --- @rc4_rand@ --- *
@@ -277,8 +277,8 @@ static const grand_ops grops = {
  *
  * Returns:    Pointer to generic random number generator interface.
  *
- * Use:                Creates a random number interface wrapper around an
- *             OFB-mode block cipher.
+ * Use:                Creates a random number interface wrapper around the RC4
+ *             stream cipher.
  */
 
 grand *rc4_rand(const void *k, size_t sz)
@@ -296,6 +296,7 @@ grand *rc4_rand(const void *k, size_t sz)
 #include <stdio.h>
 #include <string.h>
 
+#include <mLib/macros.h>
 #include <mLib/quis.h>
 #include <mLib/testrig.h>
 
@@ -310,7 +311,7 @@ static int v_encrypt(dstr *v)
   d.len = v[1].len;
   rc4_encrypt(&ctx, v[1].buf, d.buf, d.len);
 
-  if (memcmp(v[2].buf, d.buf, d.len) != 0) {
+  if (MEMCMP(v[2].buf, !=, d.buf, d.len)) {
     ok = 0;
     printf("\nfail encryption:"
           "\n\tkey        = ");
@@ -336,7 +337,7 @@ static int v_generate(dstr *v)
   d.len = v[2].len;
   rc4_encrypt(&ctx, 0, d.buf, d.len);
 
-  if (memcmp(v[2].buf, d.buf, d.len) != 0) {
+  if (MEMCMP(v[2].buf, !=, d.buf, d.len)) {
     ok = 0;
     printf("\nfail generation:"
           "\n\tkey        = ");