postinst: change order.

[debian/iodine.git] / src / base32.c

diff --git a/src/base32.c b/src/base32.c
index 8731a9252416804a61b9c55a664e00081020f6d5..d971ce25b01f400a5f34ed88c08533ec966ee91e 100644 (file)
--- a/src/base32.c
+++ b/src/base32.c
@@ -1,5 +1,6 @@
 /*
 /*

- * Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
+ * Copyright (c) 2006-2014 Erik Ekman <yarrick@kryo.se>,
+ * 2006-2009 Bjorn Andersson <flex@kryo.se>

  * Mostly rewritten 2009 J.A.Bezemer@opensourcepartners.nl
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Mostly rewritten 2009 J.A.Bezemer@opensourcepartners.nl
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -25,9 +26,9 @@
 #define BLKSIZE_RAW 5
 #define BLKSIZE_ENC 8
 
 #define BLKSIZE_RAW 5
 #define BLKSIZE_ENC 8
 

-static const char cb32[] = 
+static const char cb32[] =

        "abcdefghijklmnopqrstuvwxyz012345";
        "abcdefghijklmnopqrstuvwxyz012345";

-static const char cb32_ucase[] = 
+static const char cb32_ucase[] =

        "ABCDEFGHIJKLMNOPQRSTUVWXYZ012345";
 static unsigned char rev32[256];
 static int reverse_init = 0;
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ012345";
 static unsigned char rev32[256];
 static int reverse_init = 0;


@@ -55,19 +56,19 @@ struct encoder
        return &base32_encoder;
 }
 
        return &base32_encoder;
 }
 

-static int 
+static int

 base32_handles_dots()
 {
        return 0;
 }
 
 base32_handles_dots()
 {
        return 0;
 }
 

-static int 
+static int

 base32_blksize_raw()
 {
        return BLKSIZE_RAW;
 }
 
 base32_blksize_raw()
 {
        return BLKSIZE_RAW;
 }
 

-static int 
+static int

 base32_blksize_enc()
 {
        return BLKSIZE_ENC;
 base32_blksize_enc()
 {
        return BLKSIZE_ENC;


@@ -104,7 +105,7 @@ b32_8to5(int in)
        return rev32[in];
 }
 
        return rev32[in];
 }
 

-static int 
+static int

 base32_encode(char *buf, size_t *buflen, const void *data, size_t size)
 /*
  * Fills *buf with max. *buflen characters, encoding size bytes of *data.
 base32_encode(char *buf, size_t *buflen, const void *data, size_t size)
 /*
  * Fills *buf with max. *buflen characters, encoding size bytes of *data.


@@ -222,7 +223,7 @@ base32_decode(void *buf, size_t *buflen, const char *str, size_t slen)
                if (iout >= *buflen || iin + 1 >= slen ||
                    str[iin] == '\0' || str[iin + 1] == '\0')
                        break;
                if (iout >= *buflen || iin + 1 >= slen ||
                    str[iin] == '\0' || str[iin + 1] == '\0')
                        break;

-               ubuf[iout] = ((REV32(str[iin]) & 0x1f) << 3) | 
+               ubuf[iout] = ((REV32(str[iin]) & 0x1f) << 3) |

                             ((REV32(str[iin + 1]) & 0x1c) >> 2);
                iin++;                  /* 0 used up, iin=1 */
                iout++;
                             ((REV32(str[iin + 1]) & 0x1c) >> 2);
                iin++;                  /* 0 used up, iin=1 */
                iout++;


@@ -231,8 +232,8 @@ base32_decode(void *buf, size_t *buflen, const char *str, size_t slen)
                    str[iin] == '\0' || str[iin + 1] == '\0' ||
                    str[iin + 2] == '\0')
                        break;
                    str[iin] == '\0' || str[iin + 1] == '\0' ||
                    str[iin + 2] == '\0')
                        break;

-               ubuf[iout] = ((REV32(str[iin]) & 0x03) << 6) | 
-                            ((REV32(str[iin + 1]) & 0x1f) << 1) | 
+               ubuf[iout] = ((REV32(str[iin]) & 0x03) << 6) |
+                            ((REV32(str[iin + 1]) & 0x1f) << 1) |

                             ((REV32(str[iin + 2]) & 0x10) >> 4);
                iin += 2;               /* 1,2 used up, iin=3 */
                iout++;
                             ((REV32(str[iin + 2]) & 0x10) >> 4);
                iin += 2;               /* 1,2 used up, iin=3 */
                iout++;