WIP

Author: TingDaoK

include/aws/s3/private/s3_checksum_context.h

@@ -51,20 +51,20 @@ struct aws_s3_upload_request_checksum_context *aws_s3_upload_request_checksum_co
     const struct aws_s3_meta_request_checksum_config_storage *checksum_config);
 
 /**
- * Create a new upload request checksum context with an existing checksum value.
+ * Create a new upload request checksum context with an existing base64 encoded checksum value.
  * This is useful when resuming uploads or when the checksum is pre-calculated.
  * Returns with reference count of 1.
  *
  * @param allocator Memory allocator
  * @param checksum_config Meta request level checksum configuration (can be NULL)
- * @param existing_checksum Pre-calculated checksum value as a byte cursor
+ * @param existing_base64_checksum Pre-calculated checksum value as a byte cursor
  * @return New checksum context or NULL on error (e.g., if checksum size doesn't match algorithm)
  */
 AWS_S3_API
-struct aws_s3_upload_request_checksum_context *aws_s3_upload_request_checksum_context_new_with_existing_checksum(
+struct aws_s3_upload_request_checksum_context *aws_s3_upload_request_checksum_context_new_with_existing_base64_checksum(
     struct aws_allocator *allocator,
     const struct aws_s3_meta_request_checksum_config_storage *checksum_config,
-    struct aws_byte_cursor existing_checksum);
+    struct aws_byte_cursor existing_base64_checksum);
 
 /**
  * Acquire a reference to the upload request checksum context.

source/s3_auto_ranged_put.c

@@ -155,7 +155,7 @@ static int s_process_part_info_synced(const struct aws_s3_part_info *info, void
 
     if ((checksum_cur != NULL) && (checksum_cur->len > 0)) {
         /* Create checksum context with pre-calculated checksum */
-        part->checksum_context = aws_s3_upload_request_checksum_context_new_with_existing_checksum(
+        part->checksum_context = aws_s3_upload_request_checksum_context_new_with_existing_base64_checksum(
             auto_ranged_put->base.allocator, &auto_ranged_put->base.checksum_config, *checksum_cur);
     } else {
         part->checksum_context = aws_s3_upload_request_checksum_context_new(

source/s3_checksum_context.c

@@ -59,27 +59,27 @@ struct aws_s3_upload_request_checksum_context *aws_s3_upload_request_checksum_co
     return context;
 }
 
-struct aws_s3_upload_request_checksum_context *aws_s3_upload_request_checksum_context_new_with_existing_checksum(
+struct aws_s3_upload_request_checksum_context *aws_s3_upload_request_checksum_context_new_with_existing_base64_checksum(
     struct aws_allocator *allocator,
     const struct aws_s3_meta_request_checksum_config_storage *checksum_config,
-    struct aws_byte_cursor existing_checksum) {
+    struct aws_byte_cursor existing_base64_checksum) {
     struct aws_s3_upload_request_checksum_context *context =
         s_s3_upload_request_checksum_context_new_base(allocator, checksum_config);
     if (context) {
         /* Initial the buffer for checksum from the exist checksum */
-        if (context->encoded_checksum_size != existing_checksum.len) {
+        if (context->encoded_checksum_size != existing_base64_checksum.len) {
             struct aws_byte_cursor algo_name = aws_get_checksum_algorithm_name(context->algorithm);
             AWS_LOGF_ERROR(
                 AWS_LS_S3_GENERAL,
                 "Encoded checksum size mismatch during creating the context for algorithm " PRInSTR
                 ": expected %zu bytes, got %zu bytes",
                 AWS_BYTE_CURSOR_PRI(algo_name),
                 context->encoded_checksum_size,
-                existing_checksum.len);
+                existing_base64_checksum.len);
             aws_s3_upload_request_checksum_context_release(context);
             return NULL;
         }
-        aws_byte_buf_init_copy_from_cursor(&context->base64_checksum, allocator, existing_checksum);
+        aws_byte_buf_init_copy_from_cursor(&context->base64_checksum, allocator, existing_base64_checksum);
         context->checksum_calculated = true;
     }
     return context;

tests/s3_checksum_context_test.c

@@ -64,7 +64,8 @@ static int s_test_upload_request_checksum_context_get_checksum_cursor(struct aws
 
     /* Test get checksum cursor with context that has calculated checksum */
     struct aws_byte_cursor existing_checksum = aws_byte_cursor_from_c_str("dGVzdA==");
-    context = aws_s3_upload_request_checksum_context_new_with_existing_checksum(allocator, &config, existing_checksum);
+    context =
+        aws_s3_upload_request_checksum_context_new_with_existing_base64_checksum(allocator, &config, existing_checksum);
     ASSERT_NOT_NULL(context);
 
     cursor = aws_s3_upload_request_checksum_context_get_checksum_cursor(context);
@@ -98,7 +99,8 @@ static int s_test_upload_request_checksum_context_error_cases(struct aws_allocat
     /* Test creation with mismatched checksum size */
     struct aws_byte_cursor wrong_size_checksum = aws_byte_cursor_from_c_str("short");
     struct aws_s3_upload_request_checksum_context *context =
-        aws_s3_upload_request_checksum_context_new_with_existing_checksum(allocator, &config, wrong_size_checksum);
+        aws_s3_upload_request_checksum_context_new_with_existing_base64_checksum(
+            allocator, &config, wrong_size_checksum);
     ASSERT_NULL(context);
 
     /* Test helper functions with NULL context */