X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bfc6b93af241cdc6193a19bcd115af8ad1390a73..62bfda03da9ba46273bbbffe6be1df498b21d991:/sbr/base64.c?ds=sidebyside diff --git a/sbr/base64.c b/sbr/base64.c index 6a30e2f0..a1e54c92 100644 --- a/sbr/base64.c +++ b/sbr/base64.c @@ -11,7 +11,7 @@ #include #include -static char nib2b64[0x40+1] = +static const char nib2b64[0x40+1] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; int @@ -209,7 +209,7 @@ writeBase64raw (const unsigned char *in, size_t length, unsigned char *out) } -static unsigned char b642nib[0x80] = { +static const unsigned char b642nib[0x80] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -243,7 +243,8 @@ decodeBase64 (const char *encoded, unsigned char **decoded, size_t *len, charstring_t decoded_c = charstring_create (strlen (encoded)); MD5_CTX mdContext; - if (digest) { MD5Init (&mdContext); } + if (digest) + MD5Init (&mdContext); bitno = 18; bits = 0L; @@ -274,19 +275,22 @@ test_end: if (! skip_crs || b != '\r') { charstring_push_back (decoded_c, b); } - if (digest) { MD5Update (&mdContext, (unsigned char *) &b, 1); } + if (digest) + MD5Update (&mdContext, (unsigned char *) &b, 1); if (skip < 2) { b = (bits >> 8) & 0xff; if (! skip_crs || b != '\r') { charstring_push_back (decoded_c, b); } - if (digest) { MD5Update (&mdContext, (unsigned char *) &b, 1); } + if (digest) + MD5Update (&mdContext, (unsigned char *) &b, 1); if (skip < 1) { b = bits & 0xff; if (! skip_crs || b != '\r') { charstring_push_back (decoded_c, b); } - if (digest) { MD5Update (&mdContext, (unsigned char *) &b, 1); } + if (digest) + MD5Update (&mdContext, (unsigned char *) &b, 1); } }