use const

openziti · Jun 28, 2024 · 303fa7a · 303fa7a
1 parent 518df26
commit 303fa7a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/inc_internal/zt_internal.h b/inc_internal/zt_internal.h
@@ -133,7 +133,7 @@ struct key_exchange {
 
 int init_key_pair(struct key_pair *kp);
 
-int init_crypto(struct key_exchange *key_ex, struct key_pair *kp, uint8_t *peer_key, bool server);
+int init_crypto(struct key_exchange *key_ex, struct key_pair *kp, const uint8_t *peer_key, bool server);
 
 void free_key_exchange(struct key_exchange *key_ex);
 

diff --git a/library/bind.c b/library/bind.c
@@ -341,8 +341,8 @@ static void process_dial(struct binding_s *b, message *msg) {
     struct ziti_conn *conn = b->conn;
 
     size_t peer_key_len, marker_len;
-    uint8_t *peer_key;
-    uint8_t  *marker;
+    const uint8_t *peer_key;
+    const uint8_t *marker;
     bool peer_key_sent = message_get_bytes_header(msg, PublicKeyHeader, &peer_key, &peer_key_len);
     bool marker_sent = message_get_bytes_header(msg, ConnectionMarkerHeader, &marker, &marker_len);
 
@@ -376,12 +376,12 @@ static void process_dial(struct binding_s *b, message *msg) {
     model_map_setl(&conn->server.children, (long) client->conn_id, client);
 
     client->dial_req_seq = msg->header.seq;
-    uint8_t *source_identity = NULL;
+    const uint8_t *source_identity = NULL;
     size_t source_identity_sz = 0;
     bool caller_id_sent = message_get_bytes_header(msg, CallerIdHeader, &source_identity, &source_identity_sz);
 
     ziti_client_ctx clt_ctx = {0};
-    message_get_bytes_header(msg, AppDataHeader, &clt_ctx.app_data, &clt_ctx.app_data_sz);
+    message_get_bytes_header(msg, AppDataHeader, (const uint8_t **) &clt_ctx.app_data, &clt_ctx.app_data_sz);
     if (caller_id_sent) {
         client->source_identity = strndup((char *) source_identity, source_identity_sz);
         clt_ctx.caller_id = client->source_identity;

diff --git a/library/channel.c b/library/channel.c
@@ -694,7 +694,7 @@ static void hello_reply_cb(void *ctx, message *msg, int err) {
     if (success) {
         const char *erVersion = "<unknown>";
         size_t erVersionLen = strlen(erVersion);
-        message_get_bytes_header(msg, HelloVersionHeader, (uint8_t **) &erVersion, &erVersionLen);
+        message_get_bytes_header(msg, HelloVersionHeader, (const uint8_t **) &erVersion, &erVersionLen);
         CH_LOG(INFO, "connected. EdgeRouter version: %.*s", (int) erVersionLen, erVersion);
         ch->state = Connected;
         FREE(ch->version);

diff --git a/library/connect.c b/library/connect.c
@@ -278,7 +278,7 @@ static int send_message(struct ziti_conn *conn, message *m, struct ziti_write_re
     if (m->header.content == ContentTypeData) {
         struct msg_uuid *uuid = NULL;
         size_t len;
-        message_get_bytes_header(m, UUIDHeader, (uint8_t**) &uuid, &len);
+        message_get_bytes_header(m, UUIDHeader, (const uint8_t **) &uuid, &len);
 
         if (uuid) {
             assert(len == sizeof(*uuid));
@@ -712,7 +712,7 @@ int establish_crypto(ziti_connection conn, message *msg) {
     }
 
     size_t peer_key_len;
-    uint8_t *peer_key;
+    const uint8_t *peer_key;
     bool peer_key_sent = message_get_bytes_header(msg, PublicKeyHeader, &peer_key, &peer_key_len);
     if (!peer_key_sent) {
         CONN_LOG(ERROR, "failed to establish crypto for encrypted service: did not receive peer key");
@@ -879,7 +879,7 @@ void conn_inbound_data_msg(ziti_connection conn, message *msg) {
                     struct local_hash h;
                     crypto_hash_sha256(h.hash, msg->body, msg->header.body_len);
 
-                    if (message_get_bytes_header(msg, UUIDHeader, (uint8_t **)&uuid, &uuid_len)) {
+                    if (message_get_bytes_header(msg, UUIDHeader, (const uint8_t **) &uuid, &uuid_len)) {
                         CONN_LOG(ERROR, "uuid[" UUID_FMT "] %s corruption hash[" HASH_FMT "]",
                                  UUID_FMT_ARG(uuid),
                                  uuid->slug != htole32(h.i32[0]) ? "payload" : "crypto state",
@@ -1317,7 +1317,7 @@ static void process_edge_message(struct ziti_conn *conn, message *msg) {
     bool has_conn_id = message_get_int32_header(msg, ConnIdHeader, &conn_id);
     assert(has_conn_id && conn_id == conn->conn_id);
 
-    if (message_get_bytes_header(msg, UUIDHeader, (uint8_t **) &uuid, &uuid_len)) {
+    if (message_get_bytes_header(msg, UUIDHeader, (const uint8_t **) &uuid, &uuid_len)) {
         struct local_hash h;
         crypto_hash_sha256(h.hash, msg->body, msg->header.body_len);
         CONN_LOG(TRACE, "<= ct[%04X] uuid[" UUID_FMT "] edge_seq[%d] len[%d] ",

diff --git a/library/crypto.c b/library/crypto.c
@@ -19,7 +19,7 @@ int init_key_pair(struct key_pair *kp) {
     return crypto_kx_keypair(kp->pk, kp->sk);
 }
 
-int init_crypto(struct key_exchange *key_ex, struct key_pair *kp, uint8_t *peer_key, bool server) {
+int init_crypto(struct key_exchange *key_ex, struct key_pair *kp, const uint8_t *peer_key, bool server) {
     free(key_ex->rx);
     free(key_ex->tx);