From patchwork Thu May 23 23:59:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ghanshyam Thakkar X-Patchwork-Id: 13672461 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0B6717577 for ; Fri, 24 May 2024 00:00:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716508829; cv=none; b=KBlP04IolFYEY/Pb5izfog+n0Xx7aIpuLBDg0afD410VV9fFko18slgPFD/oFazRH8yYp39/R+K4L70NrRh+ED8udSnHaxp1533zB5xPM4aoPS81tf1LGfvlx90ZDarC+FpNRslOvyu1nscL7cXJYvgebdJCx+STVTkyfozhDaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716508829; c=relaxed/simple; bh=6HQHjW+N/3w5tEldAEVg/0IebLJd0EFrnxQfepAygqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OBTDqzXFdeDno/+9KRhCOWoPUMF8NtJamTuuad2epUbA9PecO5/6FTc7zvX7weEKd+kkrtqBpKlPlVibCvr0E6oWVaf2vEhWjSUyxzJ7WK26sxhKsqKMTsYgnRLQsLpNaK9x1eAWWeZn+GcVxiIzoeuVNCAFLMZB5o+h3mrpTb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RP8e8jhp; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RP8e8jhp" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6f8ecafd28cso284882b3a.3 for ; Thu, 23 May 2024 17:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716508827; x=1717113627; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xAd+Gat3kCe+FrRUdxhA0S8JXk+VT8NM7ivA44jzlRA=; b=RP8e8jhpwdoUsObOF1VD7eRxGB3+5LhFlZjGV6pL74YQfr4qU7HEOjkEB8KWpw3j67 FRlJdNTxUe9OmHMrf13yrq3Y0R+haRGsqhohBE0nYZj2C5bAoA2Bu66yGcztP9bqbKFi Xd/ECmmWbHSbm9maiJg0CpqGuVIQ62+rRGIpBoSmdzgrnHaQsXDeffnF5yMkl6yUdm5T o5OZr/NPfBYgWkkqzGfoNvH+3lTx8gR1N8DCgLQuPpHZYbVhDIbhQ94cn7sr1lrAURGO 7Epnavp/zATWMPaEAaoxhqEQg5sCiDmgfkSiXLEsAzwIGQvznZoQ9yhtkTw9EDm7K/ue L9hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716508827; x=1717113627; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xAd+Gat3kCe+FrRUdxhA0S8JXk+VT8NM7ivA44jzlRA=; b=U5ab2FtbykMY9dwRyZ5a+85CqRdQV8GgkwSdWCfckMblyjX/ZBfvQxbOvOjHnvWYpc 68+Oy1BC+U5pseZI3247R3R9hqrwgpXAVppabxgrj9nIyfzNU7OmLjrC+PFvGlxymmzt FrYY3OWpDmMJUQqC09k6WaHtKIZIe/Lfba32wkv/cI0eIlgOruk1k+pNkSvpDadOxrQl OGVzLUrvBAcAlSOUUxAhaLX5V7dqPYJOkoU/A5M/CnR7/6rZ0rpXpxr/aOxJJ3Bz+cZx OeFEvBOmfbk1iWzQTR6xOIi+M6rptlrc/aX5qO/AZde0zuS+g1l48fP7pVbsR6whzTAJ ZJiA== X-Forwarded-Encrypted: i=1; AJvYcCWWU93UIEOOwdv664+J+QxdsPBNhScyuxjGoepGnytKR3epoF+9WrETnR33PHe4ykffIRFCMoJTN7QcCxuOXH5W0qLC X-Gm-Message-State: AOJu0YyOm2kQPx0drxm2GZ50b0NinVwepYDxeOY9hW/uGQvovNIf0dn1 vwKZTfaYvqixPCB2rMVrpO/lK8pwlYP/fxz9sFc6BbJkqlWjiNyjBgjVdFMPPg4= X-Google-Smtp-Source: AGHT+IFkj2KFkw6Q7Hypve6bOs1dypwTs428lE0bkh177QCmTneYUi9G+lPLM9ICsh0tTHZIzuC6OA== X-Received: by 2002:a05:6a20:9783:b0:1af:d9a3:f399 with SMTP id adf61e73a8af0-1b212dfe3e3mr997539637.29.1716508826347; Thu, 23 May 2024 17:00:26 -0700 (PDT) Received: from localhost.localdomain ([2402:a00:401:a99b:f188:2dd3:d960:a8ab]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fc05ab4asm165454b3a.59.2024.05.23.17.00.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 17:00:25 -0700 (PDT) From: Ghanshyam Thakkar To: ach.lumap@gmail.com Cc: chriscool@tuxfamily.org, christian.couder@gmail.com, git@vger.kernel.org, gitster@pobox.com, kaartic.sivaraam@gmail.com, ps@pks.im Subject: [PATCH v3 1/3] strbuf: introduce strbuf_addstrings() to repeatedly add a string Date: Fri, 24 May 2024 05:29:43 +0530 Message-ID: <20240523235945.26833-2-shyamthakkar001@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523235945.26833-1-shyamthakkar001@gmail.com> References: <20240229054004.3807-1-ach.lumap@gmail.com> <20240523235945.26833-1-shyamthakkar001@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In a following commit we are going to port code from "t/helper/test-sha256.c", t/helper/test-hash.c and "t/t0015-hash.sh" to a new "t/unit-tests/t-hash.c" file using the recently added unit test framework. To port code like: perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" we are going to need a new strbuf_addstrings() function that repeatedly adds the same string a number of times to a buffer. Such a strbuf_addstrings() function would already be useful in "json-writer.c" and "builtin/submodule-helper.c" as both of these files already have code that repeatedly adds the same string. So let's introduce such a strbuf_addstrings() function in "strbuf.{c,h}" and use it in both "json-writer.c" and "builtin/submodule-helper.c". We use the "strbuf_addstrings" name as this way strbuf_addstr() and strbuf_addstrings() would be similar for strings as strbuf_addch() and strbuf_addchars() for characters. Helped-by: Junio C Hamano Mentored-by: Christian Couder Mentored-by: Kaartic Sivaraam Co-authored-by: Achu Luma Signed-off-by: Achu Luma Signed-off-by: Ghanshyam Thakkar --- builtin/submodule--helper.c | 4 +--- json-writer.c | 5 +---- strbuf.c | 9 +++++++++ strbuf.h | 5 +++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index e604cb5ddb..5620a5bf67 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -256,11 +256,9 @@ static void module_list_active(struct module_list *list) static char *get_up_path(const char *path) { - int i; struct strbuf sb = STRBUF_INIT; - for (i = count_slashes(path); i; i--) - strbuf_addstr(&sb, "../"); + strbuf_addstrings(&sb, "../", count_slashes(path)); /* * Check if 'path' ends with slash or not diff --git a/json-writer.c b/json-writer.c index 005c820aa4..25b9201f9c 100644 --- a/json-writer.c +++ b/json-writer.c @@ -46,10 +46,7 @@ static void append_quoted_string(struct strbuf *out, const char *in) static void indent_pretty(struct json_writer *jw) { - int k; - - for (k = 0; k < jw->open_stack.len; k++) - strbuf_addstr(&jw->json, " "); + strbuf_addstrings(&jw->json, " ", jw->open_stack.len); } /* diff --git a/strbuf.c b/strbuf.c index 0d929e4e19..e3ca9b1ee9 100644 --- a/strbuf.c +++ b/strbuf.c @@ -313,6 +313,15 @@ void strbuf_add(struct strbuf *sb, const void *data, size_t len) strbuf_setlen(sb, sb->len + len); } +void strbuf_addstrings(struct strbuf *sb, const char *s, size_t n) +{ + size_t len = strlen(s); + + strbuf_grow(sb, st_mult(len, n)); + for (size_t i = 0; i < n; i++) + strbuf_add(sb, s, len); +} + void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) { strbuf_grow(sb, sb2->len); diff --git a/strbuf.h b/strbuf.h index 97fa4a3d01..003f880ff7 100644 --- a/strbuf.h +++ b/strbuf.h @@ -310,6 +310,11 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s) strbuf_add(sb, s, strlen(s)); } +/** + * Add a NUL-terminated string the specified number of times to the buffer. + */ +void strbuf_addstrings(struct strbuf *sb, const char *s, size_t n); + /** * Copy the contents of another buffer at the end of the current one. */ From patchwork Thu May 23 23:59:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ghanshyam Thakkar X-Patchwork-Id: 13672462 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74BA03C2F for ; Fri, 24 May 2024 00:00:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716508835; cv=none; b=dSeGegwj/C0JM0fhYU+R6i/+wPQcgfDNe1UH8lGqOkqZl1s0L/VxDtbzeAsK07IGEtFmXIocRPNugkJ1VyJWhQfLM7IWM7CkI+n3tn0pHt4LVKYwtxCoMPK7vN5y/nPSBtR0gszF9KGaS6ex3QaNEv3n2ieNyHYqtN7CHpM3roU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716508835; c=relaxed/simple; bh=fjAZyfaD2ViMkrLBB9hM0vLQdJDrxn/viL8rxckIUQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mIktJ2+b66wasH6rqSd0BHjeCORWx0F4x/i/dzy+mH2IgDBfJuoaC9vT/QFZSlemE3UOwtMWCxNO9gMKPIXlpyBnCNabg0czFEMCMI9q8YghU2HNul8rQ1d8Hu168bUbBR6obvAUCUL+nKk+EXJCVZejBR8oYiSjcry78eYhFD4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZnY+KbV9; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZnY+KbV9" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6f8e819a540so374679b3a.0 for ; Thu, 23 May 2024 17:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716508832; x=1717113632; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=znLlry+H5rvKuOiHPl8PUt16pTkQnkYyzKDiKWD+Wi8=; b=ZnY+KbV9iIc7uqadQTQXpggw/5G89LyZOO9uns52rMKKZQ0iB6mdPBjuz8c8Erufuq v2x3Vm3kfR5Jn5PvWcfcOwxNMFyA6S6pjSdJfRRn8/s2ceu6VdTnsqjBG++AZwMrbLpN YzAJlanxMP18NXXU8L9FeKqL+MQvrk1K5ydCgfaO7fL/MMgtVThl4sAozBufVUQuyiD+ aEwcgb17WOeoWimjia92Rrqr1SwbSADr5Sy0L9n4dyT5/Up3PF93H9zqA2qCcgSfIeZA /3HPRT0a0XjImKS9wkmeTfJkwsIH09+bg5QzkdLxFe1SNPPCc++3TMUpRVGnYcqf7MN3 SnfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716508832; x=1717113632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=znLlry+H5rvKuOiHPl8PUt16pTkQnkYyzKDiKWD+Wi8=; b=FoDD+b0FDEMdPMXEWaj7SHYK4e7LCd2b28zjJIUo5QA8WEzDtnUmFTLraYOqdd07xN awGoTaDRY0zrppzC514BNuty7PK4mqNDIyFHqOz1Gulpgc1pZqu/tp1gqQkUCRbATy+m kXPDDhFfXrCn0qJ4QJ1dVyMJhdjM1kPZINHz5LudQl4H8h601BclyCc9N7rIfgKgXAwD 0zhiC8s0RgRn9zQb3WC1UQuNJj3Hm3NcWB76yqYPgsG594mXBLqOnyWq4cZ3mPJKrKNE q7hecdGCKF/UHwOEe/9rrW9HCelLz/1iNUuRT2ktSAN10YyAvtcNQdtAv7aZigN91Tac XbAA== X-Forwarded-Encrypted: i=1; AJvYcCX9FnJ8tcai26ikZaDSuFHu4kOgwvufEnnf/zV+dGN3zodOdt5KE4uVaLaEe9tW9WgRJRQwMZhOREHan0hlPHKEuCcS X-Gm-Message-State: AOJu0Yzs3QGKiMN+GkWiX5HiXa8Pzosi9y2gyTtFgWdUtfr9J5rv/w5k lGay0iWxnD9FXejCSUw63ZbqybQacEKg8CB5iDuVFF9yi4F/qxn7 X-Google-Smtp-Source: AGHT+IFgSWJUtrQOZoHfueK5lJlNkEmAlFwoTtLldLHrOLKf/FQyuGPKTzyA4j2392dpVj9p7YMlsg== X-Received: by 2002:a05:6a00:27a7:b0:6f6:802d:db82 with SMTP id d2e1a72fcca58-6f8f42b6d4fmr695594b3a.23.1716508830130; Thu, 23 May 2024 17:00:30 -0700 (PDT) Received: from localhost.localdomain ([2402:a00:401:a99b:f188:2dd3:d960:a8ab]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fc05ab4asm165454b3a.59.2024.05.23.17.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 17:00:29 -0700 (PDT) From: Ghanshyam Thakkar To: ach.lumap@gmail.com Cc: chriscool@tuxfamily.org, christian.couder@gmail.com, git@vger.kernel.org, gitster@pobox.com, kaartic.sivaraam@gmail.com, ps@pks.im Subject: [PATCH v3 2/3] t/: port helper/test-sha1.c to unit-tests/t-hash.c Date: Fri, 24 May 2024 05:29:44 +0530 Message-ID: <20240523235945.26833-3-shyamthakkar001@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523235945.26833-1-shyamthakkar001@gmail.com> References: <20240229054004.3807-1-ach.lumap@gmail.com> <20240523235945.26833-1-shyamthakkar001@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 t/helper/test-sha1 and t/t0015-hash.sh test the hash implementation of SHA-1 in Git with basic SHA-1 hash values. Migrate them to the new unit testing framework for better debugging and runtime performance. The sha1 subcommand from test-tool is still not removed because it is relied upon by t0013-sha1dc (which requires 'test-tool sha1' dying when it is used on a file created to contain the known sha1 attack) and pack_trailer():lib-pack.sh. Helped-by: Patrick Steinhardt Mentored-by: Christian Couder Mentored-by: Kaartic Sivaraam Co-authored-by: Achu Luma Signed-off-by: Achu Luma Signed-off-by: Ghanshyam Thakkar --- Makefile | 1 + t/t0015-hash.sh | 22 ------------------ t/unit-tests/t-hash.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 22 deletions(-) create mode 100644 t/unit-tests/t-hash.c diff --git a/Makefile b/Makefile index 8f4432ae57..2b19fdf6ae 100644 --- a/Makefile +++ b/Makefile @@ -1335,6 +1335,7 @@ THIRD_PARTY_SOURCES += sha1collisiondetection/% THIRD_PARTY_SOURCES += sha1dc/% UNIT_TEST_PROGRAMS += t-ctype +UNIT_TEST_PROGRAMS += t-hash UNIT_TEST_PROGRAMS += t-mem-pool UNIT_TEST_PROGRAMS += t-prio-queue UNIT_TEST_PROGRAMS += t-strbuf diff --git a/t/t0015-hash.sh b/t/t0015-hash.sh index 0a087a1983..2264e702d5 100755 --- a/t/t0015-hash.sh +++ b/t/t0015-hash.sh @@ -5,28 +5,6 @@ test_description='test basic hash implementation' TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh -test_expect_success 'test basic SHA-1 hash values' ' - test-tool sha1 actual && - grep da39a3ee5e6b4b0d3255bfef95601890afd80709 actual && - printf "a" | test-tool sha1 >actual && - grep 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 actual && - printf "abc" | test-tool sha1 >actual && - grep a9993e364706816aba3e25717850c26c9cd0d89d actual && - printf "message digest" | test-tool sha1 >actual && - grep c12252ceda8be8994d5fa0290a47231c1d16aae3 actual && - printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha1 >actual && - grep 32d10c7b8cf96570ca04ce37f2a19d84240d3a89 actual && - perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" | - test-tool sha1 >actual && - grep 34aa973cd4c4daa4f61eeb2bdbad27316534016f actual && - printf "blob 0\0" | test-tool sha1 >actual && - grep e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 actual && - printf "blob 3\0abc" | test-tool sha1 >actual && - grep f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f actual && - printf "tree 0\0" | test-tool sha1 >actual && - grep 4b825dc642cb6eb9a060e54bf8d69288fbee4904 actual -' - test_expect_success 'test basic SHA-256 hash values' ' test-tool sha256 actual && grep e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 actual && diff --git a/t/unit-tests/t-hash.c b/t/unit-tests/t-hash.c new file mode 100644 index 0000000000..89dfea9cc1 --- /dev/null +++ b/t/unit-tests/t-hash.c @@ -0,0 +1,54 @@ +#include "test-lib.h" +#include "hash-ll.h" +#include "hex.h" +#include "strbuf.h" + +static void check_hash_data(const void *data, size_t data_length, + const char *expected, int algo) +{ + git_hash_ctx ctx; + unsigned char hash[GIT_MAX_HEXSZ]; + const struct git_hash_algo *algop = &hash_algos[algo]; + + if (!check(!!data)) { + test_msg("Error: No data provided when expecting: %s", expected); + return; + } + + algop->init_fn(&ctx); + algop->update_fn(&ctx, data, data_length); + algop->final_fn(hash, &ctx); + + check_str(hash_to_hex_algop(hash, algop), expected); +} + +/* Works with a NUL terminated string. Doesn't work if it should contain a NUL character. */ +#define TEST_SHA1_STR(data, expected) \ + TEST(check_hash_data(data, strlen(data), expected, GIT_HASH_SHA1), \ + "SHA1 (%s) works", #data) + +/* Only works with a literal string, useful when it contains a NUL character. */ +#define TEST_SHA1_LITERAL(literal, expected) \ + TEST(check_hash_data(literal, (sizeof(literal) - 1), expected, GIT_HASH_SHA1), \ + "SHA1 (%s) works", #literal) + +int cmd_main(int argc, const char **argv) +{ + struct strbuf aaaaaaaaaa_100000 = STRBUF_INIT; + + strbuf_addstrings(&aaaaaaaaaa_100000, "aaaaaaaaaa", 100000); + + TEST_SHA1_STR("", "da39a3ee5e6b4b0d3255bfef95601890afd80709"); + TEST_SHA1_STR("a", "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8"); + TEST_SHA1_STR("abc", "a9993e364706816aba3e25717850c26c9cd0d89d"); + TEST_SHA1_STR("message digest", "c12252ceda8be8994d5fa0290a47231c1d16aae3"); + TEST_SHA1_STR("abcdefghijklmnopqrstuvwxyz", "32d10c7b8cf96570ca04ce37f2a19d84240d3a89"); + TEST_SHA1_STR(aaaaaaaaaa_100000.buf, "34aa973cd4c4daa4f61eeb2bdbad27316534016f"); + TEST_SHA1_LITERAL("blob 0\0", "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"); + TEST_SHA1_LITERAL("blob 3\0abc", "f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f"); + TEST_SHA1_LITERAL("tree 0\0", "4b825dc642cb6eb9a060e54bf8d69288fbee4904"); + + strbuf_release(&aaaaaaaaaa_100000); + + return test_done(); +} From patchwork Thu May 23 23:59:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ghanshyam Thakkar X-Patchwork-Id: 13672463 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D88108493 for ; Fri, 24 May 2024 00:00:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716508836; cv=none; b=XwVgAi8q1NAUNB80Wj3AGQDwptguOmhZP3tb4a3VAiF0tUL6Z3ym4aVL6/4pYdVEKUXx66zNFMCPK0OY3qbdDcgfp/sLjvIsbVEqZmbvx7VDLo9kX9aYpMRmMxn4khACauhJw1YSwxQ++VZDSCjotq95g0p3l1TWlWkHIFDjk7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716508836; c=relaxed/simple; bh=Ur5CYVL+OVTXt+dZqGwgtCn+VLtv73i1TbPphlDAQI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BKJDgwens/sAJvDWSYbANF0B+EONZ+76vzqr82dmWTz8dk3/MtJI+pgkJ2ld1r0jh+kxJxtzOjd3J7f4+deveTLM0R9DodVbjnlP5GpUhfPH//9j9rm/53dHwx4NKiR0oT8PgwYQC5Tn/cFX8BNsFcOzCGHU6UNomVLQXM/iBrU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gu4gx0K1; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gu4gx0K1" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6f8e9878514so329039b3a.1 for ; Thu, 23 May 2024 17:00:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716508834; x=1717113634; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OqF14g+xzfp6dpH+QnGhFvHPX0wcZ8IzypPesrV3JjU=; b=gu4gx0K1xi/btqkM03uBMi99BlIXx0g/S8b3sEypEGPuscshlwJCXsyMnUGCCj256M Y634wVedU9LJwlxGzJaM7MCdO8UxPYzas9q2pNSxPyPqJQ2JDeqp/gq8+co6lYZ2BKoU Jk7ic4shYS9EO4upS3nfwP51FhDe9cPGUW7MfRxFs5iRXMqKsBLIQmXW+Yhia4Uksn7t 2cy1NaBA1vkMZc96YwJB6lP3I15BkRbOHDjpOJifXKzeTPSkM1TN4BSMtKm6fJAq2zKo 1DozQAQ5PX/TR2nGNjLi1CQDTxyX7ZvKAT8nJi9XILd4gqzB7DPWNLc7gpydYscjfPB7 gASQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716508834; x=1717113634; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OqF14g+xzfp6dpH+QnGhFvHPX0wcZ8IzypPesrV3JjU=; b=SPItyiVPawt1xhwTjds2drkUETkNqQ85sndDny+cFPKzFxfdnj1AF0e/qAi2LjE7YM ucuI0gMW+IrdbIcDPqyZ8orceUd8QzIeybyf/DnMi9MTYkLINWZUTkdpyy3BiWvb8Pys UBl5C2xE1eGm6HVfHLq6x+lYRhJCtzMVvUfKoqT+szv+Ia8WjvudcJ2cqZe7tw3LHKdX /F00swbyA1hUaThnINmd8idKiW513/JgUd1dDTJJjysyk/KJyoh5lj2ol7slGOa2U6Ih mlmeIvZW3HFAYwQ+zMldf7gGk7iW6qLcJW8yKrBhk4ETvVElV8VYkEXC4yTn5QMEX4Pu xvgQ== X-Forwarded-Encrypted: i=1; AJvYcCUfO4WuUNEq9eHF824hEZRwvYFbkgcun0nj4KoLWRLdWmqHz1g65TSmVeOJpRu4n4kyLr0FoUBfkaKKXA2qZxd40U26 X-Gm-Message-State: AOJu0YyT7C8IjGaWIE2sLGw4QkDrQByqLG/kN8sJvucKFlTouUWrIKqj K+Y6lRnRWPE84tcLkajOcMeARYdEiLhmodIjNwBhcoKpSWOkUN/iWAVZrzaR1Po= X-Google-Smtp-Source: AGHT+IF7AdXNW4O/xc9vM0QkBZvQDVpjqPYsBLspEBbgKK7Ia/ed9gl9WutAGsHDNAIeRZT1yjGgZg== X-Received: by 2002:a05:6a20:2446:b0:1af:6911:7ff4 with SMTP id adf61e73a8af0-1b212cc727amr1253181637.7.1716508833917; Thu, 23 May 2024 17:00:33 -0700 (PDT) Received: from localhost.localdomain ([2402:a00:401:a99b:f188:2dd3:d960:a8ab]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fc05ab4asm165454b3a.59.2024.05.23.17.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 17:00:33 -0700 (PDT) From: Ghanshyam Thakkar To: ach.lumap@gmail.com Cc: chriscool@tuxfamily.org, christian.couder@gmail.com, git@vger.kernel.org, gitster@pobox.com, kaartic.sivaraam@gmail.com, ps@pks.im Subject: [PATCH v3 3/3] t/: port helper/test-sha256.c to unit-tests/t-hash.c Date: Fri, 24 May 2024 05:29:45 +0530 Message-ID: <20240523235945.26833-4-shyamthakkar001@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523235945.26833-1-shyamthakkar001@gmail.com> References: <20240229054004.3807-1-ach.lumap@gmail.com> <20240523235945.26833-1-shyamthakkar001@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 t/helper/test-sha256 and t/t0015-hash test the hash implementation of SHA-256 in Git with basic SHA-256 hash values. Port them to the new unit testing framework for better debugging, simplicity and faster runtime. The necessary building blocks are already implemented in t-hash in the previous commit which ported test-sha1. The 'sha256' subcommand of test-tool is still not removed, because it is used by pack_trailer() in lib-pack.sh, which is used in many tests of the t53** series. Helped-by: Patrick Steinhardt Mentored-by: Christian Couder Mentored-by: Kaartic Sivaraam Co-authored-by: Achu Luma Signed-off-by: Achu Luma Signed-off-by: Ghanshyam Thakkar --- t/t0015-hash.sh | 34 ---------------------------------- t/unit-tests/t-hash.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 34 deletions(-) delete mode 100755 t/t0015-hash.sh diff --git a/t/t0015-hash.sh b/t/t0015-hash.sh deleted file mode 100755 index 2264e702d5..0000000000 --- a/t/t0015-hash.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -test_description='test basic hash implementation' - -TEST_PASSES_SANITIZE_LEAK=true -. ./test-lib.sh - -test_expect_success 'test basic SHA-256 hash values' ' - test-tool sha256 actual && - grep e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 actual && - printf "a" | test-tool sha256 >actual && - grep ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb actual && - printf "abc" | test-tool sha256 >actual && - grep ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad actual && - printf "message digest" | test-tool sha256 >actual && - grep f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650 actual && - printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha256 >actual && - grep 71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73 actual && - # Try to exercise the chunking code by turning autoflush on. - perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" | - test-tool sha256 >actual && - grep cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 actual && - perl -e "$| = 1; print q{abcdefghijklmnopqrstuvwxyz} for 1..100000;" | - test-tool sha256 >actual && - grep e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35 actual && - printf "blob 0\0" | test-tool sha256 >actual && - grep 473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813 actual && - printf "blob 3\0abc" | test-tool sha256 >actual && - grep c1cf6e465077930e88dc5136641d402f72a229ddd996f627d60e9639eaba35a6 actual && - printf "tree 0\0" | test-tool sha256 >actual && - grep 6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321 actual -' - -test_done diff --git a/t/unit-tests/t-hash.c b/t/unit-tests/t-hash.c index 89dfea9cc1..0f86cd3730 100644 --- a/t/unit-tests/t-hash.c +++ b/t/unit-tests/t-hash.c @@ -32,11 +32,24 @@ static void check_hash_data(const void *data, size_t data_length, TEST(check_hash_data(literal, (sizeof(literal) - 1), expected, GIT_HASH_SHA1), \ "SHA1 (%s) works", #literal) + +/* Works with a NUL terminated string. Doesn't work if it should contain a NUL character. */ +#define TEST_SHA256_STR(data, expected) \ + TEST(check_hash_data(data, strlen(data), expected, GIT_HASH_SHA256), \ + "SHA256 (%s) works", #data) + +/* Only works with a literal string, useful when it contains a NUL character. */ +#define TEST_SHA256_LITERAL(literal, expected) \ + TEST(check_hash_data(literal, (sizeof(literal) - 1), expected, GIT_HASH_SHA256), \ + "SHA256 (%s) works", #literal) + int cmd_main(int argc, const char **argv) { struct strbuf aaaaaaaaaa_100000 = STRBUF_INIT; + struct strbuf alphabet_100000 = STRBUF_INIT; strbuf_addstrings(&aaaaaaaaaa_100000, "aaaaaaaaaa", 100000); + strbuf_addstrings(&alphabet_100000, "abcdefghijklmnopqrstuvwxyz", 100000); TEST_SHA1_STR("", "da39a3ee5e6b4b0d3255bfef95601890afd80709"); TEST_SHA1_STR("a", "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8"); @@ -48,7 +61,19 @@ int cmd_main(int argc, const char **argv) TEST_SHA1_LITERAL("blob 3\0abc", "f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f"); TEST_SHA1_LITERAL("tree 0\0", "4b825dc642cb6eb9a060e54bf8d69288fbee4904"); + TEST_SHA256_STR("", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"); + TEST_SHA256_STR("a", "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"); + TEST_SHA256_STR("abc", "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"); + TEST_SHA256_STR("message digest", "f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650"); + TEST_SHA256_STR("abcdefghijklmnopqrstuvwxyz", "71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73"); + TEST_SHA256_STR(aaaaaaaaaa_100000.buf, "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0"); + TEST_SHA256_STR(alphabet_100000.buf, "e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35"); + TEST_SHA256_LITERAL("blob 0\0", "473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813"); + TEST_SHA256_LITERAL("blob 3\0abc", "c1cf6e465077930e88dc5136641d402f72a229ddd996f627d60e9639eaba35a6"); + TEST_SHA256_LITERAL("tree 0\0", "6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321"); + strbuf_release(&aaaaaaaaaa_100000); + strbuf_release(&alphabet_100000); return test_done(); }