Switch decodeBase64() second argument to an unsigned char **.

diff --git a/h/prototypes.h b/h/prototypes.h
index c9dd291e986eedfd26a145e574e121e043365857..bc5b6a569a17f341f3ffc1324013f1caa8607444 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -484,7 +484,8 @@ int writeBase64raw (const unsigned char *, size_t, unsigned char *);
  * fourth argument:   non-zero for text content, and for which CR's should be skipped
  * fifth argument:  for an MD5 digest, it can be null
  */
  * fourth argument:   non-zero for text content, and for which CR's should be skipped
  * fifth argument:  for an MD5 digest, it can be null
  */

-int decodeBase64 (const char *, const char **, size_t *, int, unsigned char *);
+int decodeBase64 (const char *, unsigned char **, size_t *, int,
+                 unsigned char *);

 
 void hexify (const unsigned char *, size_t, char **);
 
 
 void hexify (const unsigned char *, size_t, char **);
 

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 3661200658356e0539dfcbc11f8cd680a9aaf7fb..4fb6b1f4c9fdcb5f2d655f3f3cea714d747a80f5 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -1012,7 +1012,7 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            *outdata = NULL;
            *outdatalen = 0;
        } else {
            *outdata = NULL;
            *outdatalen = 0;
        } else {

-           rc = decodeBase64(line + 4, (const char **) outdata, &len, 0, NULL);
+           rc = decodeBase64(line + 4, outdata, &len, 0, NULL);

            if (rc != OK) {
                netsec_err(errstr, "Unable to decode base64 response");
                return NOTOK;
            if (rc != OK) {
                netsec_err(errstr, "Unable to decode base64 response");
                return NOTOK;

diff --git a/sbr/base64.c b/sbr/base64.c
index f1fec4edf46b24df6fc4e6dc4aa43a3d6a1f179f..79d7aa944a81d8e4c469c2756be957650431b74d 100644 (file)
--- a/sbr/base64.c
+++ b/sbr/base64.c
@@ -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);
 

diff --git a/sbr/netsec.c b/sbr/netsec.c
index 7d5c48c80ef508ad97aa28d6e1f9f48cbbb8399f..18bb97ac311cb92ab9fe99f7b9ff41e9bb7b3edf 100644 (file)
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -292,7 +292,7 @@ void
 netsec_b64_snoop_decoder(netsec_context *nsc, const char *string, size_t len,
                         void *context)
 {
 netsec_b64_snoop_decoder(netsec_context *nsc, const char *string, size_t len,
                         void *context)
 {

-    const char *decoded;
+    unsigned char *decoded;

     size_t decodedlen;
     int offset;
     NMH_UNUSED(nsc);
     size_t decodedlen;
     int offset;
     NMH_UNUSED(nsc);

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 984b1430aac6be2fc997f5dcb8525c7c87f76fdf..8ebe18943627d13d113d86aa3a950f33d74b99a1 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1751,7 +1751,7 @@ openBase64 (CT ct, char **file)
     /* sbeck -- handle suffixes */
     CI ci;
     CE ce = &ct->c_cefile;
     /* sbeck -- handle suffixes */
     CI ci;
     CE ce = &ct->c_cefile;

-    const char *decoded;
+    unsigned char *decoded;

     size_t decoded_len;
     unsigned char digest[16];
 
     size_t decoded_len;
     unsigned char digest[16];
 


@@ -1840,7 +1840,7 @@ openBase64 (CT ct, char **file)
     if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
                       ct->c_digested ? digest : NULL) == OK) {
         size_t i;
     if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
                       ct->c_digested ? digest : NULL) == OK) {
         size_t i;

-        const char *decoded_p = decoded;
+        unsigned char *decoded_p = decoded;

         for (i = 0; i < decoded_len; ++i) {
             putc (*decoded_p++, ce->ce_fp);
         }
         for (i = 0; i < decoded_len; ++i) {
             putc (*decoded_p++, ce->ce_fp);
         }


@@ -2906,13 +2906,13 @@ openURL (CT ct, char **file)
 static int
 readDigest (CT ct, char *cp)
 {
 static int
 readDigest (CT ct, char *cp)
 {

-    const char *digest;
+    unsigned char *digest;

 
     size_t len;
     if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {
         const size_t maxlen = sizeof ct->c_digest / sizeof ct->c_digest[0];
 
 
     size_t len;
     if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {
         const size_t maxlen = sizeof ct->c_digest / sizeof ct->c_digest[0];
 

-        if (strlen (digest) <= maxlen) {
+        if (strlen ((char *) digest) <= maxlen) {

             memcpy (ct->c_digest, digest, maxlen);
 
             if (debugsw) {
             memcpy (ct->c_digest, digest, maxlen);
 
             if (debugsw) {


@@ -2929,7 +2929,7 @@ readDigest (CT ct, char *cp)
         } else {
             if (debugsw) {
                 fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
         } else {
             if (debugsw) {
                 fprintf (stderr, "invalid MD5 digest (got %d octets)\n",

-                         (int) strlen (digest));
+                         (int) strlen ((char *) digest));

             }
 
             return NOTOK;
             }
 
             return NOTOK;

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 466146c3bc9283e5d21e71380b826b3b0dcfa865..8e1394b9e0211470bf0b4f71baff004f3db307bf 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -383,7 +383,7 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            *outdata = NULL;
            *outdatalen = 0;
        } else {
            *outdata = NULL;
            *outdatalen = 0;
        } else {

-           rc = decodeBase64(line + 2, (const char **) outdata, &len, 0, NULL);
+           rc = decodeBase64(line + 2, outdata, &len, 0, NULL);

            *outdatalen = len;
            if (rc != OK) {
                netsec_err(errstr, "Unable to decode base64 response");
            *outdatalen = len;
            if (rc != OK) {
                netsec_err(errstr, "Unable to decode base64 response");