head	1.2;
access;
symbols
	perseant-exfatfs-base-20250801:1.2;
locks; strict;
comment	@# @;


1.2
date	2025.04.16.22.46.37;	author christos;	state dead;
branches;
next	1.1;
commitid	PumbTGQAO8h1skRF;

1.1
date	2025.04.16.15.01.21;	author christos;	state Exp;
branches;
next	;
commitid	6ux9dupYpXgxShRF;


desc
@@


1.2
log
@merge changes between 3.0.15 and 3.0.16
@
text
@diff -ru dist.old/crypto/rc5/rc5_ecb.c dist/crypto/rc5/rc5_ecb.c
--- dist.old/crypto/rc5/rc5_ecb.c	2023-05-07 14:40:21.000000000 -0400
+++ dist/crypto/rc5/rc5_ecb.c	2025-04-15 15:09:25.000000000 -0400
@@@@ -20,7 +20,7 @@@@
 void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
                         RC5_32_KEY *ks, int encrypt)
 {
-    RC5_32_INT l, d[2];
+    unsigned long l, d[2];
 
     c2l(in, l);
     d[0] = l;
diff -ru dist.old/crypto/rc5/rc5_enc.c dist/crypto/rc5/rc5_enc.c
--- dist.old/crypto/rc5/rc5_enc.c	2023-05-07 14:40:21.000000000 -0400
+++ dist/crypto/rc5/rc5_enc.c	2025-04-15 15:09:25.000000000 -0400
@@@@ -21,10 +21,10 @@@@
                         long length, RC5_32_KEY *ks, unsigned char *iv,
                         int encrypt)
 {
-    register RC5_32_INT tin0, tin1;
-    register RC5_32_INT tout0, tout1, xor0, xor1;
+    register unsigned long tin0, tin1;
+    register unsigned long tout0, tout1, xor0, xor1;
     register long l = length;
-    RC5_32_INT tin[2];
+    unsigned long tin[2];
 
     if (encrypt) {
         c2l(iv, tout0);
@@@@ -93,7 +93,7 @@@@
     tin[0] = tin[1] = 0;
 }
 
-void RC5_32_encrypt(RC5_32_INT *d, RC5_32_KEY *key)
+void RC5_32_encrypt(unsigned long *d, RC5_32_KEY *key)
 {
     RC5_32_INT a, b, *s;
 
@@@@ -129,7 +129,7 @@@@
     d[1] = b;
 }
 
-void RC5_32_decrypt(RC5_32_INT *d, RC5_32_KEY *key)
+void RC5_32_decrypt(unsigned long *d, RC5_32_KEY *key)
 {
     RC5_32_INT a, b, *s;
 
diff -ru dist.old/crypto/rc5/rc5cfb64.c dist/crypto/rc5/rc5cfb64.c
--- dist.old/crypto/rc5/rc5cfb64.c	2023-05-07 14:40:21.000000000 -0400
+++ dist/crypto/rc5/rc5cfb64.c	2025-04-15 15:09:25.000000000 -0400
@@@@ -26,10 +26,10 @@@@
                           long length, RC5_32_KEY *schedule,
                           unsigned char *ivec, int *num, int encrypt)
 {
-    register RC5_32_INT v0, v1, t;
+    register unsigned long v0, v1, t;
     register int n = *num;
     register long l = length;
-    RC5_32_INT ti[2];
+    unsigned long ti[2];
     unsigned char *iv, c, cc;
 
     iv = (unsigned char *)ivec;
@@@@ -40,7 +40,7 @@@@
                 ti[0] = v0;
                 c2l(iv, v1);
                 ti[1] = v1;
-                RC5_32_encrypt(ti, schedule);
+                RC5_32_encrypt((unsigned long *)ti, schedule);
                 iv = (unsigned char *)ivec;
                 t = ti[0];
                 l2c(t, iv);
@@@@ -60,7 +60,7 @@@@
                 ti[0] = v0;
                 c2l(iv, v1);
                 ti[1] = v1;
-                RC5_32_encrypt(ti, schedule);
+                RC5_32_encrypt((unsigned long *)ti, schedule);
                 iv = (unsigned char *)ivec;
                 t = ti[0];
                 l2c(t, iv);
diff -ru dist.old/crypto/rc5/rc5ofb64.c dist/crypto/rc5/rc5ofb64.c
--- dist.old/crypto/rc5/rc5ofb64.c	2023-05-07 14:40:21.000000000 -0400
+++ dist/crypto/rc5/rc5ofb64.c	2025-04-15 15:09:25.000000000 -0400
@@@@ -25,12 +25,12 @@@@
                           long length, RC5_32_KEY *schedule,
                           unsigned char *ivec, int *num)
 {
-    register RC5_32_INT v0, v1, t;
+    register unsigned long v0, v1, t;
     register int n = *num;
     register long l = length;
     unsigned char d[8];
     register char *dp;
-    RC5_32_INT ti[2];
+    unsigned long ti[2];
     unsigned char *iv;
     int save = 0;
 
@@@@ -44,7 +44,7 @@@@
     l2c(v1, dp);
     while (l--) {
         if (n == 0) {
-            RC5_32_encrypt(ti, schedule);
+            RC5_32_encrypt((unsigned long *)ti, schedule);
             dp = (char *)d;
             t = ti[0];
             l2c(t, dp);
@


1.1
log
@Patches to be reverted
@
text
@@