Clean up base64_url_{encode,decode} pointer types

Allow any pointer to be used as source for encoding and use char * as
the return value from encoding and input value for decoding to reduce
number of type casts needed in the callers.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/src/common/dpp.c b/src/common/dpp.c
index b82ac8a9bd07b8c5299b0a7ccc3fbe4373b2d13e..1dfc346728755d26af1235d64ba5eb058f378b45 100644 (file)
--- a/src/common/dpp.c
+++ b/src/common/dpp.c
@@ -4679,9 +4679,9 @@ static int dpp_build_jwk(struct wpabuf *buf, const char *name, EVP_PKEY *key,
        if (!pub)
                goto fail;
        pos = wpabuf_head(pub);
-       x = (char *) base64_url_encode(pos, curve->prime_len, NULL);
+       x = base64_url_encode(pos, curve->prime_len, NULL);
        pos += curve->prime_len;
-       y = (char *) base64_url_encode(pos, curve->prime_len, NULL);
+       y = base64_url_encode(pos, curve->prime_len, NULL);
        if (!x || !y)
                goto fail;
 
@@ -4851,12 +4851,10 @@ skip_groups:
        os_snprintf(jws_prot_hdr, sizeof(jws_prot_hdr),
                    "{\"typ\":\"dppCon\",\"kid\":\"%s\",\"alg\":\"%s\"}",
                    auth->conf->kid, curve->jws_alg);
-       signed1 = (char *) base64_url_encode((unsigned char *) jws_prot_hdr,
-                                            os_strlen(jws_prot_hdr),
-                                            &signed1_len);
-       signed2 = (char *) base64_url_encode(wpabuf_head(dppcon),
-                                            wpabuf_len(dppcon),
-                                            &signed2_len);
+       signed1 = base64_url_encode(jws_prot_hdr, os_strlen(jws_prot_hdr),
+                                   &signed1_len);
+       signed2 = base64_url_encode(wpabuf_head(dppcon), wpabuf_len(dppcon),
+                                   &signed2_len);
        if (!signed1 || !signed2)
                goto fail;
 
@@ -4906,8 +4904,7 @@ skip_groups:
        signature_len = 2 * curve->prime_len;
        wpa_hexdump(MSG_DEBUG, "DPP: signedConnector ECDSA signature (raw r,s)",
                    signature, signature_len);
-       signed3 = (char *) base64_url_encode(signature, signature_len,
-                                            &signed3_len);
+       signed3 = base64_url_encode(signature, signature_len, &signed3_len);
        if (!signed3)
                goto fail;
 
@@ -5819,8 +5816,7 @@ dpp_process_signed_connector(struct dpp_signed_connector_info *info,
                ret = DPP_STATUS_INVALID_CONNECTOR;
                goto fail;
        }
-       prot_hdr = base64_url_decode((const unsigned char *) pos,
-                                    end - pos, &prot_hdr_len);
+       prot_hdr = base64_url_decode(pos, end - pos, &prot_hdr_len);
        if (!prot_hdr) {
                wpa_printf(MSG_DEBUG,
                           "DPP: Failed to base64url decode signedConnector JWS Protected Header");
@@ -5852,8 +5848,7 @@ dpp_process_signed_connector(struct dpp_signed_connector_info *info,
                goto fail;
        }
        signed_end = end - 1;
-       info->payload = base64_url_decode((const unsigned char *) pos,
-                                         end - pos, &info->payload_len);
+       info->payload = base64_url_decode(pos, end - pos, &info->payload_len);
        if (!info->payload) {
                wpa_printf(MSG_DEBUG,
                           "DPP: Failed to base64url decode signedConnector JWS Payload");
@@ -5864,8 +5859,7 @@ dpp_process_signed_connector(struct dpp_signed_connector_info *info,
                          "DPP: signedConnector - JWS Payload",
                          info->payload, info->payload_len);
        pos = end + 1;
-       signature = base64_url_decode((const unsigned char *) pos,
-                                     os_strlen(pos), &signature_len);
+       signature = base64_url_decode(pos, os_strlen(pos), &signature_len);
        if (!signature) {
                wpa_printf(MSG_DEBUG,
                           "DPP: Failed to base64url decode signedConnector signature");
@@ -6605,13 +6599,13 @@ struct wpabuf * dpp_build_conn_status_result(struct dpp_authentication *auth,
                return NULL;
        wpabuf_printf(json, "{\"result\":%d", result);
        if (ssid) {
-               unsigned char *ssid64;
+               char *ssid64;
 
                ssid64 = base64_url_encode(ssid, ssid_len, NULL);
                if (!ssid64)
                        goto fail;
                wpabuf_put_str(json, ",\"ssid64\":\"");
-               wpabuf_put_str(json, (char *) ssid64);
+               wpabuf_put_str(json, ssid64);
                os_free(ssid64);
                wpabuf_put_str(json, "\"");
        }
@@ -6758,8 +6752,7 @@ dpp_keygen_configurator(const char *curve, const u8 *privkey,
                goto fail;
        }
 
-       conf->kid = (char *) base64_url_encode(kid_hash, sizeof(kid_hash),
-                                              NULL);
+       conf->kid = base64_url_encode(kid_hash, sizeof(kid_hash), NULL);
        if (!conf->kid)
                goto fail;
 out:
@@ -7021,8 +7014,7 @@ dpp_peer_intro(struct dpp_introduction *intro, const char *own_connector,
                wpa_printf(MSG_DEBUG, "DPP: Own connector is missing the second dot (.)");
                goto fail;
        }
-       own_conn = base64_url_decode((const unsigned char *) pos,
-                                    end - pos, &own_conn_len);
+       own_conn = base64_url_decode(pos, end - pos, &own_conn_len);
        if (!own_conn) {
                wpa_printf(MSG_DEBUG,
                           "DPP: Failed to base64url decode own signedConnector JWS Payload");
@@ -8756,8 +8748,7 @@ char * dpp_corrupt_connector_signature(const char *connector)
 
        wpa_printf(MSG_DEBUG, "DPP: Original base64url encoded signature: %s",
                   pos);
-       signature = base64_url_decode((const unsigned char *) pos,
-                                     os_strlen(pos), &signature_len);
+       signature = base64_url_decode(pos, os_strlen(pos), &signature_len);
        if (!signature || signature_len == 0)
                goto fail;
        wpa_hexdump(MSG_DEBUG, "DPP: Original Connector signature",
@@ -8765,8 +8756,7 @@ char * dpp_corrupt_connector_signature(const char *connector)
        signature[signature_len - 1] ^= 0x01;
        wpa_hexdump(MSG_DEBUG, "DPP: Corrupted Connector signature",
                    signature, signature_len);
-       signed3 = (char *) base64_url_encode(signature, signature_len,
-                                            &signed3_len);
+       signed3 = base64_url_encode(signature, signature_len, &signed3_len);
        if (!signed3)
                goto fail;
        os_memcpy(pos, signed3, signed3_len);

diff --git a/src/utils/base64.c b/src/utils/base64.c
index 50a828abbba797829e697ee1c5861df3a1719f22..0518cf0836dd7784e50cb998910674cb71f1575d 100644 (file)
--- a/src/utils/base64.c
+++ b/src/utils/base64.c
@@ -172,10 +172,10 @@ unsigned char * base64_encode(const unsigned char *src, size_t len,
 }
 
 
-unsigned char * base64_url_encode(const unsigned char *src, size_t len,
-                                 size_t *out_len)
+char * base64_url_encode(const void *src, size_t len, size_t *out_len)
 {
-       return base64_gen_encode(src, len, out_len, base64_url_table, 0);
+       return (char *) base64_gen_encode(src, len, out_len, base64_url_table,
+                                         0);
 }
 
 
@@ -196,8 +196,8 @@ unsigned char * base64_decode(const unsigned char *src, size_t len,
 }
 
 
-unsigned char * base64_url_decode(const unsigned char *src, size_t len,
-                                 size_t *out_len)
+unsigned char * base64_url_decode(const char *src, size_t len, size_t *out_len)
 {
-       return base64_gen_decode(src, len, out_len, base64_url_table);
+       return base64_gen_decode((const unsigned char *) src, len, out_len,
+                                base64_url_table);
 }

diff --git a/src/utils/base64.h b/src/utils/base64.h
index 2e755a88e8fa8edb9be8409ed6d3329a6c74143f..1e9f0532c1e9ed209bbbf66d773cd91574091b42 100644 (file)
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -13,9 +13,7 @@ unsigned char * base64_encode(const unsigned char *src, size_t len,
                              size_t *out_len);
 unsigned char * base64_decode(const unsigned char *src, size_t len,
                              size_t *out_len);
-unsigned char * base64_url_encode(const unsigned char *src, size_t len,
-                                 size_t *out_len);
-unsigned char * base64_url_decode(const unsigned char *src, size_t len,
-                                 size_t *out_len);
+char * base64_url_encode(const void *src, size_t len, size_t *out_len);
+unsigned char * base64_url_decode(const char *src, size_t len, size_t *out_len);
 
 #endif /* BASE64_H */

diff --git a/src/utils/json.c b/src/utils/json.c
index 3e5e2147722388340bf3d6287aeeaf0fc2652359..0b7de780b28910b55fcb8812c13d4a72357a62aa 100644 (file)
--- a/src/utils/json.c
+++ b/src/utils/json.c
@@ -514,8 +514,8 @@ struct wpabuf * json_get_member_base64url(struct json_token *json,
        token = json_get_member(json, name);
        if (!token || token->type != JSON_STRING)
                return NULL;
-       buf = base64_url_decode((const unsigned char *) token->string,
-                               os_strlen(token->string), &buflen);
+       buf = base64_url_decode(token->string, os_strlen(token->string),
+                               &buflen);
        if (!buf)
                return NULL;
        ret = wpabuf_alloc_ext_data(buf, buflen);