Replace `if (p) free(p)' with `mh_xfree(p)'.

[nmh] / sbr / base64.c

diff --git a/sbr/base64.c b/sbr/base64.c
index 80ca86e08726bb4f8774e7929fb80524bf3ab73a..79d7aa944a81d8e4c469c2756be957650431b74d 100644 (file)
--- a/sbr/base64.c
+++ b/sbr/base64.c
@@ -113,7 +113,7 @@ writeBase64aux (FILE *in, FILE *out, int crlf)
      4 * [length/3]  +  length/57  +  2
    But double the length will certainly be sufficient. */
 int
      4 * [length/3]  +  length/57  +  2
    But double the length will certainly be sufficient. */
 int

-writeBase64 (unsigned char *in, size_t length, unsigned char *out)
+writeBase64 (const unsigned char *in, size_t length, unsigned char *out)

 {
     unsigned int n = BPERLIN;
 
 {
     unsigned int n = BPERLIN;
 


@@ -121,7 +121,7 @@ writeBase64 (unsigned char *in, size_t length, unsigned char *out)
        unsigned long bits;
        unsigned char *bp;
        unsigned int cc;
        unsigned long bits;
        unsigned char *bp;
        unsigned int cc;

-       for (cc = 0, bp = in; length > 0 && cc < 3; ++cc, ++bp, --length)
+       for (cc = 0; length > 0 && cc < 3; ++cc, --length)

           /* empty */ ;
 
        if (cc == 0) {
           /* empty */ ;
 
        if (cc == 0) {


@@ -168,13 +168,13 @@ writeBase64 (unsigned char *in, size_t length, unsigned char *out)
  */
 
 int
  */
 
 int

-writeBase64raw (unsigned char *in, size_t length, unsigned char *out)
+writeBase64raw (const unsigned char *in, size_t length, unsigned char *out)

 {
     while (1) {
        unsigned long bits;
        unsigned char *bp;
        unsigned int cc;
 {
     while (1) {
        unsigned long bits;
        unsigned char *bp;
        unsigned int cc;

-       for (cc = 0, bp = in; length > 0 && cc < 3; ++cc, ++bp, --length)
+       for (cc = 0; length > 0 && cc < 3; ++cc, --length)

           /* empty */ ;
 
        if (cc == 0) {
           /* empty */ ;
 
        if (cc == 0) {


@@ -233,8 +233,8 @@ static unsigned char b642nib[0x80] = {
  * See description of arguments with declaration in h/prototypes.h.
  */
 int
  * See description of arguments with declaration in h/prototypes.h.
  */
 int

-decodeBase64 (const char *encoded, const char **decoded, size_t *len, int skip_crs,
-              unsigned char *digest) {
+decodeBase64 (const char *encoded, unsigned char **decoded, size_t *len,
+             int skip_crs, unsigned char *digest) {

     const char *cp = encoded;
     int self_delimiting = 0;
     int bitno, skip;
     const char *cp = encoded;
     int self_delimiting = 0;
     int bitno, skip;


@@ -314,7 +314,7 @@ test_end:
         return NOTOK;
     }
 
         return NOTOK;
     }
 

-    *decoded = charstring_buffer_copy (decoded_c);
+    *decoded = (unsigned char *) charstring_buffer_copy (decoded_c);

     *len = charstring_bytes (decoded_c);
     charstring_free (decoded_c);
 
     *len = charstring_bytes (decoded_c);
     charstring_free (decoded_c);
 


@@ -324,3 +324,35 @@ test_end:
 
     return OK;
 }
 
     return OK;
 }

+
+
+/*
+ * Prepare an unsigned char array for display by replacing non-printable
+ * ASCII bytes with their hex representation.  Assumes ASCII input.  output
+ * is allocated by the function and must be freed by the caller.
+ */
+void
+hexify (const unsigned char *input, size_t len, char **output) {
+    /* Start with a charstring capacity that's arbitrarily larger than len. */
+    const charstring_t tmp = charstring_create (2 * len);
+    const unsigned char *cp = input;
+    size_t i;
+
+    for (i = 0; i < len; ++i, ++cp) {
+        if (isascii(*cp) && isprint(*cp)) {
+            charstring_push_back (tmp, (const char) *cp);
+        } else {
+            char s[16];
+            const int num = snprintf(s, sizeof s, "[0x%02x]", *cp);
+
+            if (num <= 0  ||  (unsigned int) num >= sizeof s) {
+                advise (NULL, "hexify failed to write nonprintable character, needed %d bytes", num + 1);
+            } else {
+                charstring_append_cstring (tmp, s);
+            }
+        }
+    }
+
+    *output = charstring_buffer_copy (tmp);
+    charstring_free (tmp);
+}