Skip to content

Commit bd6992a

Browse files
ConcyclicsConcyclics
authored
Merge pull request #2 from jedisct1/j
Add Makefile, test vectors and fix finalization
2 parents 4d3d1cb + 3bc13a2 commit bd6992a

File tree

5 files changed

+413
-6
lines changed

5 files changed

+413
-6
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
bin
2+
*~
3+
.zig-cache

‎Makefile‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# HiAE Makefile
2+
# High-Throughput Authenticated Encryption Algorithm
3+
4+
# Compiler and flags
5+
CC = cc
6+
7+
# Detect architecture and set appropriate flags
8+
ARCH := $(shell uname -m)
9+
ifeq ($(ARCH),x86_64)
10+
# x86-64 flags - enable AES-NI
11+
CFLAGS = -O3 -march=native -maes -I code
12+
else ifeq ($(ARCH),aarch64)
13+
# ARM64 flags - enable crypto extensions
14+
CFLAGS = -O3 -march=native+crypto -I code
15+
else ifeq ($(ARCH),arm64)
16+
# ARM64 flags (macOS naming) - enable crypto extensions
17+
CFLAGS = -O3 -march=native+crypto -I code
18+
else
19+
$(error Unsupported architecture: $(ARCH). HiAE requires x86-64 with AES-NI or ARM64 with crypto extensions)
20+
endif
21+
22+
LDFLAGS =
23+
24+
# Source files
25+
SOURCES = code/HiAE.c
26+
HEADERS = code/HiAE.h
27+
28+
# Output directory for binaries
29+
BINDIR = bin
30+
31+
# Target executables
32+
TARGETS = $(BINDIR)/perf_test $(BINDIR)/func_test $(BINDIR)/test_vectors $(BINDIR)/HiAE-MAC $(BINDIR)/HiAE-File-AEAD
33+
34+
# Default target
35+
all: $(BINDIR) $(TARGETS)
36+
37+
# Create bin directory
38+
$(BINDIR):
39+
@mkdir -p $(BINDIR)
40+
41+
# Performance test
42+
$(BINDIR)/perf_test: $(BINDIR) $(SOURCES) $(HEADERS) test/performance_test.c
43+
@echo "Building performance test..."
44+
$(CC) $(CFLAGS) $(SOURCES) test/performance_test.c -o $@ $(LDFLAGS)
45+
46+
# Functional test
47+
$(BINDIR)/func_test: $(BINDIR) $(SOURCES) $(HEADERS) test/function_test.c
48+
@echo "Building functional test..."
49+
$(CC) $(CFLAGS) $(SOURCES) test/function_test.c -o $@ $(LDFLAGS)
50+
51+
# Test vectors validation
52+
$(BINDIR)/test_vectors: $(BINDIR) $(SOURCES) $(HEADERS) test/test_vectors_ietf.c
53+
@echo "Building test vectors validation..."
54+
$(CC) $(CFLAGS) $(SOURCES) test/test_vectors_ietf.c -o $@ $(LDFLAGS)
55+
56+
# HiAE-MAC application
57+
$(BINDIR)/HiAE-MAC: $(BINDIR) $(SOURCES) $(HEADERS) app/HiAE-MAC.c
58+
@echo "Building HiAE-MAC application..."
59+
$(CC) $(CFLAGS) $(SOURCES) app/HiAE-MAC.c -o $@ $(LDFLAGS)
60+
61+
# HiAE-File-AEAD application
62+
$(BINDIR)/HiAE-File-AEAD: $(BINDIR) $(SOURCES) $(HEADERS) app/HiAE-File-AEAD.c
63+
@echo "Building HiAE-File-AEAD application..."
64+
$(CC) $(CFLAGS) $(SOURCES) app/HiAE-File-AEAD.c -o $@ $(LDFLAGS)
65+
66+
# Test targets
67+
test: $(BINDIR)/func_test $(BINDIR)/test_vectors
68+
@echo "Running functional tests..."
69+
./$(BINDIR)/func_test
70+
@echo ""
71+
@echo "Running test vector validation..."
72+
./$(BINDIR)/test_vectors
73+
74+
test-vectors: $(BINDIR)/test_vectors
75+
@echo "Running test vector validation..."
76+
./$(BINDIR)/test_vectors
77+
78+
benchmark: $(BINDIR)/perf_test
79+
@echo "Running performance benchmark..."
80+
./$(BINDIR)/perf_test
81+
82+
# Clean target
83+
clean:
84+
@echo "Cleaning build artifacts..."
85+
@rm -rf $(BINDIR)
86+
@rm -f perf_test func_test HiAE-MAC HiAE-File-AEAD
87+
88+
# Help target
89+
help:
90+
@echo "HiAE Makefile targets:"
91+
@echo " make all - Build all targets (default)"
92+
@echo " make test - Build and run all tests"
93+
@echo " make test-vectors - Build and run test vector validation"
94+
@echo " make benchmark - Build and run performance benchmark"
95+
@echo " make perf_test - Build performance test only"
96+
@echo " make func_test - Build functional test only"
97+
@echo " make test_vectors - Build test vectors validation only"
98+
@echo " make HiAE-MAC - Build HiAE-MAC application"
99+
@echo " make HiAE-File-AEAD - Build file AEAD application"
100+
@echo " make clean - Remove all build artifacts"
101+
@echo " make help - Show this help message"
102+
103+
# Individual target shortcuts
104+
perf_test: $(BINDIR)/perf_test
105+
func_test: $(BINDIR)/func_test
106+
test_vectors: $(BINDIR)/test_vectors
107+
HiAE-MAC: $(BINDIR)/HiAE-MAC
108+
HiAE-File-AEAD: $(BINDIR)/HiAE-File-AEAD
109+
110+
# Phony targets
111+
.PHONY: all test test-vectors benchmark clean help perf_test func_test test_vectors HiAE-MAC HiAE-File-AEAD

‎code/HiAE.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ void HiAE_stream_proc_ad(DATA128b* state, const uint8_t *ad, size_t len) {
572572

573573
void HiAE_stream_finalize(DATA128b* state, uint64_t ad_len, uint64_t plain_len, uint8_t *tag) {
574574
uint64_t lens[2];
575-
lens[0] = ad_len;
576-
lens[1] = plain_len;
575+
lens[0] = ad_len * 8;
576+
lens[1] = plain_len * 8;
577577
DATA128b temp, tmp[STATE];
578578
temp = SIMD_LOAD((uint8_t *)lens);
579579
INIT_UPDATE(temp);

‎test/function_test.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ int stream_API_test_case_1() {
138138
uint8_t correct_state_init[256] = {0xb7, 0xf4, 0xd5, 0xf0, 0x7c, 0xc9, 0x6f, 0x18, 0x48, 0x3f, 0xb4, 0xcb, 0xdf, 0x08, 0x9b, 0x45, 0x1d, 0x3d, 0x1c, 0x77, 0x30, 0x36, 0x49, 0x95, 0x89, 0xf6, 0x62, 0x5f, 0xbc, 0x75, 0x2f, 0xb0, 0x5c, 0x5f, 0x74, 0x32, 0xf7, 0xee, 0x99, 0x48, 0x28, 0x1b, 0x98, 0x75, 0x58, 0xe4, 0xee, 0x39, 0x29, 0x44, 0x73, 0xe0, 0x54, 0xb6, 0x68, 0x27, 0x76, 0x41, 0x81, 0x65, 0x60, 0x98, 0x2f, 0xe5, 0x5b, 0xd3, 0x14, 0xa4, 0x78, 0xfa, 0x24, 0xe3, 0x86, 0x58, 0x0a, 0x5b, 0x64, 0x58, 0x6e, 0x55, 0x4a, 0x3d, 0x19, 0x44, 0x70, 0x8d, 0xb0, 0xb7, 0x2d, 0x5b, 0xdd, 0x83, 0x69, 0xcb, 0x0c, 0x2d, 0xb5, 0x06, 0xef, 0x5a, 0x5e, 0x2c, 0xac, 0xd0, 0x43, 0x30, 0x41, 0x26, 0x71, 0x02, 0x1e, 0x8d, 0x54, 0xb4, 0xa9, 0x6e, 0xc5, 0xd3, 0x31, 0x17, 0x75, 0x90, 0x63, 0x46, 0x51, 0xb4, 0xba, 0x35, 0xa8, 0xa1, 0x01, 0x02, 0xca, 0x2b, 0xd8, 0xc5, 0xdd, 0xcd, 0x59, 0x89, 0x45, 0xf9, 0x66, 0xb4, 0x5a, 0x87, 0xae, 0xee, 0xaa, 0x75, 0x4c, 0x00, 0x71, 0x6d, 0x67, 0x13, 0xca, 0xbb, 0xfd, 0x73, 0xe1, 0x50, 0x1f, 0x2f, 0x70, 0xab, 0x68, 0x88, 0x51, 0xea, 0x77, 0x7b, 0x20, 0xc9, 0x7c, 0xc0, 0x1c, 0x87, 0xe3, 0x6c, 0x4c, 0xd9, 0x65, 0xfe, 0x28, 0xc0, 0x88, 0x0d, 0xaf, 0x81, 0x37, 0x1c, 0x7d, 0xf0, 0x16, 0xd9, 0x27, 0x95, 0x8e, 0x7a, 0xb3, 0x42, 0x96, 0xea, 0x74, 0x03, 0xf8, 0x3c, 0x54, 0x79, 0x4c, 0x58, 0x92, 0x04, 0xcf, 0x8c, 0x8a, 0xf0, 0x09, 0x2a, 0xc1, 0xd7, 0x54, 0x60, 0x3b, 0x57, 0xcf, 0x9b, 0x2e, 0x33, 0x02, 0xc4, 0x89, 0xa0, 0x64, 0x87, 0xa1, 0xb6, 0x3f, 0x26, 0xfc, 0xc7, 0x63, 0x40, 0x25, 0xfa, 0x6f, 0x6f, 0xf6, 0xec, 0x51, 0x7d, 0x0a, 0x26, 0xc5, 0x02};
139139
uint8_t correct_state_ad[256] = {0x28, 0x45, 0x72, 0xe1, 0x55, 0xb7, 0x69, 0x26, 0x77, 0x40, 0x80, 0x64, 0x61, 0x99, 0x2e, 0xe4, 0x5a, 0xd2, 0x15, 0xa5, 0x79, 0xfb, 0x25, 0xe2, 0x87, 0x59, 0x0b, 0x5a, 0x65, 0x59, 0x6f, 0x54, 0x4b, 0x3c, 0x18, 0x45, 0x71, 0x8c, 0xb1, 0xb6, 0x2c, 0x5a, 0xdc, 0x82, 0x68, 0xca, 0x0d, 0x2c, 0xb5, 0x06, 0xef, 0x5a, 0x5e, 0x2c, 0xac, 0xd0, 0x43, 0x30, 0x41, 0x26, 0x71, 0x02, 0x1e, 0x8d, 0x54, 0xb4, 0xa9, 0x6e, 0xc5, 0xd3, 0x31, 0x17, 0x75, 0x90, 0x63, 0x46, 0x51, 0xb4, 0xba, 0x35, 0xa8, 0xa1, 0x01, 0x02, 0xca, 0x2b, 0xd8, 0xc5, 0xdd, 0xcd, 0x59, 0x89, 0x45, 0xf9, 0x66, 0xb4, 0x5a, 0x87, 0xae, 0xee, 0xaa, 0x75, 0x4c, 0x00, 0x71, 0x6d, 0x67, 0x13, 0xca, 0xbb, 0xfd, 0x73, 0xe1, 0x50, 0x1f, 0x2f, 0x70, 0xab, 0x68, 0x88, 0x51, 0xea, 0x77, 0x7b, 0x20, 0xc9, 0x7c, 0xc0, 0x1c, 0x87, 0xe3, 0x6c, 0x4c, 0xd9, 0x65, 0xfe, 0x28, 0xc0, 0x88, 0x0d, 0xaf, 0x81, 0x37, 0x1c, 0x7d, 0xf0, 0x16, 0xd9, 0x27, 0x95, 0x8e, 0x7a, 0xb3, 0x42, 0x96, 0xea, 0x74, 0x03, 0xf8, 0x3c, 0x55, 0x78, 0x4d, 0x59, 0x93, 0x05, 0xce, 0x8d, 0x8b, 0xf1, 0x08, 0x2b, 0xc0, 0xd6, 0x55, 0x61, 0x3a, 0x56, 0xce, 0x9a, 0x2f, 0x32, 0x03, 0xc5, 0x88, 0xa1, 0x65, 0x86, 0xa0, 0xb7, 0x3e, 0x27, 0xfd, 0xc6, 0x62, 0x41, 0x24, 0xfb, 0x6e, 0x6e, 0xf7, 0xed, 0x50, 0x7c, 0x0b, 0x27, 0xc4, 0x03, 0xf4, 0x6a, 0xc6, 0xf1, 0xee, 0x54, 0xf0, 0xad, 0xc8, 0xc0, 0x4e, 0x7c, 0x1b, 0x14, 0x41, 0x1c, 0x00, 0xdd, 0xee, 0xce, 0x47, 0xea, 0xd7, 0x4f, 0x68, 0x86, 0xa2, 0x04, 0x4a, 0x58, 0xa8, 0xe5, 0xbe, 0xc6, 0xfc, 0x8a, 0x7a, 0xba, 0x7a, 0x3b, 0xbb, 0x0c, 0xee, 0x7f, 0x1e, 0xad, 0xdf, 0x24};
140140
uint8_t correct_state_enc[256] = {0x55, 0xb5, 0xa8, 0x6f, 0xc4, 0xd2, 0x30, 0x16, 0x74, 0x91, 0x62, 0x47, 0x50, 0xb5, 0xbb, 0x34, 0xa9, 0xa0, 0x00, 0x03, 0xcb, 0x2a, 0xd9, 0xc4, 0xdc, 0xcc, 0x58, 0x88, 0x44, 0xf8, 0x67, 0xb5, 0x5b, 0x86, 0xaf, 0xef, 0xab, 0x74, 0x4d, 0x01, 0x70, 0x6c, 0x66, 0x12, 0xcb, 0xba, 0xfc, 0x72, 0xe1, 0x50, 0x1f, 0x2f, 0x70, 0xab, 0x68, 0x88, 0x51, 0xea, 0x77, 0x7b, 0x20, 0xc9, 0x7c, 0xc0, 0x1c, 0x87, 0xe3, 0x6c, 0x4c, 0xd9, 0x65, 0xfe, 0x28, 0xc0, 0x88, 0x0d, 0xaf, 0x81, 0x37, 0x1c, 0x7d, 0xf0, 0x16, 0xd9, 0x27, 0x95, 0x8e, 0x7a, 0xb3, 0x42, 0x96, 0xea, 0x74, 0x03, 0xf8, 0x3c, 0x55, 0x78, 0x4d, 0x59, 0x93, 0x05, 0xce, 0x8d, 0x8b, 0xf1, 0x08, 0x2b, 0xc0, 0xd6, 0x55, 0x61, 0x3a, 0x56, 0xce, 0x9a, 0x2f, 0x32, 0x03, 0xc5, 0x88, 0xa1, 0x65, 0x86, 0xa0, 0xb7, 0x3e, 0x27, 0xfd, 0xc6, 0x62, 0x41, 0x24, 0xfb, 0x6e, 0x6e, 0xf7, 0xed, 0x50, 0x7c, 0x0b, 0x27, 0xc4, 0x03, 0xf5, 0x6b, 0xc7, 0xf0, 0xef, 0x55, 0xf1, 0xac, 0xc9, 0xc1, 0x4f, 0x7d, 0x1a, 0x15, 0x40, 0x1d, 0x01, 0xdc, 0xef, 0xcf, 0x46, 0xeb, 0xd6, 0x4e, 0x69, 0x87, 0xa3, 0x05, 0x4b, 0x59, 0xa9, 0xe4, 0xbf, 0xc7, 0xfd, 0x8b, 0x7b, 0xbb, 0x7b, 0x3a, 0xba, 0x0d, 0xef, 0x7e, 0x1f, 0xac, 0xde, 0x25, 0x97, 0xa0, 0x5f, 0xf7, 0xba, 0x3f, 0xe2, 0xea, 0xb0, 0x3e, 0xc6, 0xd4, 0x38, 0x04, 0x7b, 0x97, 0x1f, 0x3d, 0x55, 0xb5, 0x79, 0x3d, 0xc0, 0x29, 0xd5, 0xef, 0x82, 0x72, 0x9c, 0x2e, 0x1f, 0xfa, 0x1b, 0xf9, 0xe9, 0x55, 0x0f, 0x06, 0xd1, 0xe9, 0xa6, 0x8e, 0x6a, 0xea, 0xcc, 0x6c, 0x63, 0xd8, 0x8f, 0x39, 0x78, 0xab, 0x8b, 0x3a, 0xb9, 0xaa, 0xc2, 0xaf, 0x9c, 0x34, 0xc3, 0xac, 0x51, 0x02};
141-
uint8_t correct_state_final[256] = {0xfb, 0x73, 0xd8, 0x10, 0x65, 0x61, 0xd1, 0x68, 0xd3, 0x1c, 0xc1, 0x26, 0x12, 0x09, 0x61, 0x6f, 0x73, 0xf6, 0xcf, 0xa6, 0x9a, 0x75, 0x8c, 0xea, 0xdc, 0x56, 0xf6, 0x08, 0x46, 0xd6, 0x40, 0x10, 0x37, 0x03, 0xfa, 0xa4, 0xf4, 0xe7, 0xb4, 0x93, 0xc6, 0x4a, 0x74, 0x03, 0x2e, 0xeb, 0x31, 0x6c, 0xc3, 0xbd, 0x9d, 0x3a, 0x53, 0x3e, 0x59, 0xb1, 0x26, 0xa6, 0x9c, 0x03, 0xad, 0x53, 0xb9, 0x93, 0xf8, 0xb4, 0x92, 0x1e, 0x52, 0xf9, 0xa4, 0xf9, 0x27, 0xac, 0xc4, 0xbb, 0x23, 0x6f, 0xe5, 0x8b, 0x36, 0x9e, 0x01, 0x6d, 0x51, 0x4d, 0x74, 0xe5, 0x58, 0x35, 0x21, 0x33, 0x97, 0x75, 0xbf, 0xe8, 0xe8, 0xfc, 0x41, 0x8d, 0xa6, 0x1e, 0x24, 0xfb, 0xa1, 0x3d, 0x22, 0x35, 0x90, 0xf0, 0x3c, 0x00, 0x7a, 0xe1, 0x19, 0xc2, 0x04, 0x29, 0x6b, 0xd0, 0x01, 0x3e, 0xdc, 0xe4, 0xa6, 0x8c, 0xf8, 0x5b, 0x86, 0x80, 0x63, 0xab, 0xfc, 0x31, 0xb4, 0x30, 0x1d, 0xdd, 0x24, 0x01, 0xb7, 0xd3, 0xb1, 0x2b, 0xc8, 0x4c, 0x2f, 0x80, 0x63, 0xf9, 0x61, 0xab, 0xf5, 0xab, 0x00, 0x74, 0x55, 0xd4, 0x82, 0xd2, 0x7f, 0x95, 0x0e, 0x46, 0xff, 0x54, 0x81, 0x56, 0x47, 0x65, 0x3f, 0xe2, 0x71, 0xc2, 0x76, 0x3f, 0xc4, 0x78, 0x48, 0x0f, 0xbc, 0xed, 0x0e, 0x7c, 0xa2, 0x95, 0x79, 0xcf, 0xcc, 0xfc, 0x1e, 0x59, 0xd4, 0xaa, 0x59, 0xe4, 0xaa, 0x69, 0x1e, 0xc5, 0x9b, 0xcf, 0x26, 0xee, 0x73, 0x4a, 0x0d, 0xf0, 0x04, 0x5b, 0xb9, 0x68, 0x0a, 0xe3, 0x76, 0xbc, 0xa6, 0x5d, 0x25, 0xc0, 0x7e, 0x17, 0xb5, 0xa0, 0x09, 0xac, 0xe5, 0x42, 0xda, 0x46, 0xfd, 0x17, 0xf1, 0x66, 0x2f, 0xdf, 0x6d, 0x9e, 0x3a, 0x77, 0xfd, 0x1a, 0xe5, 0x03, 0x03, 0xa3, 0x9d, 0x09, 0x8e, 0xf5, 0x43, 0xf7, 0xe7, 0x6b, 0x28, 0x36};
142-
uint8_t correct_tag[16] = {0xf1, 0x6a, 0x51, 0xbb, 0x5c, 0x50, 0x7d, 0x41, 0x7f, 0xbb, 0xc9, 0x29, 0x8d, 0x90, 0xc6, 0x36};
141+
uint8_t correct_state_final[256] = {0x6b, 0x57, 0xb1, 0xe2, 0x63, 0x75, 0xd9, 0xea, 0xe1, 0xc1, 0xf7, 0x56, 0x30, 0x3f, 0xe5, 0x7d, 0x8b, 0xaf, 0xda, 0x7c, 0x17, 0x45, 0x5b, 0xe1, 0x77, 0xcd, 0x54, 0x0e, 0x64, 0x5b, 0x83, 0xc5, 0xc2, 0x6a, 0xaa, 0x55, 0x6a, 0x5a, 0xa4, 0xa6, 0x2f, 0x4a, 0xed, 0x88, 0x61, 0x49, 0x09, 0x8e, 0x8d, 0x6e, 0x93, 0x6f, 0xd0, 0x4f, 0xc9, 0x61, 0x22, 0xe4, 0xb6, 0xf5, 0xe9, 0x4a, 0x45, 0x70, 0xa1, 0xda, 0x24, 0x7c, 0x1a, 0xa7, 0x7f, 0xca, 0x97, 0xb5, 0xc7, 0x47, 0x23, 0xb2, 0x0c, 0xe5, 0x48, 0x37, 0xf3, 0xac, 0xcc, 0x15, 0x9b, 0x73, 0xfa, 0x89, 0x84, 0xdf, 0x82, 0x3d, 0x88, 0x9c, 0x1f, 0x51, 0x62, 0xf8, 0x0a, 0x04, 0x4d, 0x7b, 0x83, 0x2b, 0xcc, 0x8a, 0xc1, 0x1f, 0xfb, 0x2e, 0x3e, 0x34, 0x40, 0x9c, 0xec, 0x71, 0x49, 0x84, 0xd3, 0xf0, 0x75, 0xcd, 0x05, 0xd6, 0x9d, 0x1f, 0x57, 0xa4, 0x55, 0xd9, 0xab, 0xc0, 0xb9, 0x54, 0xa6, 0x7d, 0x26, 0x05, 0xc0, 0x49, 0xe2, 0x60, 0xc9, 0x63, 0x99, 0x09, 0x60, 0x0f, 0xc1, 0xe7, 0x77, 0x9e, 0xc7, 0x52, 0xc0, 0x5e, 0x13, 0x52, 0x54, 0x04, 0x20, 0x4b, 0x16, 0x40, 0xf4, 0x97, 0xfb, 0xd1, 0x7c, 0x0b, 0xc2, 0x54, 0x12, 0x04, 0x15, 0x4d, 0x8b, 0xa2, 0x9f, 0x69, 0x45, 0x38, 0xdb, 0xd3, 0xb5, 0x80, 0xb7, 0x8d, 0xce, 0x82, 0x78, 0x44, 0x48, 0x71, 0x72, 0x27, 0x24, 0xe2, 0xb8, 0x80, 0xa6, 0x7d, 0xc0, 0xbf, 0xd2, 0xfc, 0x0b, 0xc6, 0x9d, 0x8d, 0x23, 0x3e, 0x37, 0x3e, 0x78, 0x7f, 0xea, 0xf4, 0x1b, 0x69, 0x28, 0x94, 0xaa, 0x20, 0x3b, 0x6d, 0x6b, 0x65, 0xd7, 0x55, 0xf4, 0x78, 0x12, 0x36, 0x8b, 0x1f, 0x37, 0xc1, 0x49, 0x7e, 0x8d, 0x15, 0x76, 0xa8, 0x32, 0xf7, 0x1d, 0x19, 0xae, 0xa4, 0xa9, 0xbc, 0x57, 0xa5};
142+
uint8_t correct_tag[16] = {0x28, 0x26, 0xa3, 0xad, 0xf0, 0xd0, 0x30, 0xe8, 0x7e, 0x3a, 0xda, 0x3d, 0x35, 0x9a, 0x7f, 0xb6};
143143
uint8_t correct_cipher_text[64] = {0x5d, 0x43, 0x36, 0xd9, 0x3b, 0xd3, 0x1a, 0x89, 0xfd, 0x28, 0x94, 0x63, 0x92, 0x32, 0x1c, 0xee, 0xfd, 0xa4, 0xf8, 0x5d, 0x34, 0xc6, 0xf3, 0xd4, 0xc6, 0x73, 0x62, 0xc7, 0x4f, 0x57, 0x4c, 0xca, 0x7f, 0xbc, 0x77, 0x96, 0x76, 0xce, 0x53, 0xc5, 0x17, 0xdd, 0x36, 0xb3, 0x47, 0x7d, 0x59, 0xb8, 0xd2, 0xd1, 0x04, 0x0e, 0x67, 0xf6, 0x21, 0xca, 0xb2, 0x5d, 0xff, 0xf1, 0xa8, 0xcd, 0x92, 0x12};
144144

145145
HiAE_stream_init(state, key, iv);
@@ -222,7 +222,7 @@ int AEAD_API_test_case_1() {
222222

223223
uint8_t tag[16];
224224

225-
uint8_t correct_tag_AEAD[16] = {0x0d, 0x74, 0x44, 0xbf, 0xc5, 0x93, 0x52, 0x8c, 0x6a, 0x87, 0xdb, 0xa0, 0x3a, 0xd4, 0x6e, 0xf2};
225+
uint8_t correct_tag_AEAD[16] = {0xba, 0xc9, 0x14, 0x48, 0x87, 0xcb, 0xbc, 0xf8, 0xc5, 0x22, 0xe7, 0x18, 0xba, 0x3b, 0x84, 0x7a};
226226
uint8_t correct_cipher_text_AEAD[384] = {0x4e, 0x72, 0x1a, 0xbc, 0xfa, 0x53, 0xec, 0x15, 0x0a, 0xc4, 0x7a, 0xc8, 0xad, 0x05, 0x5f, 0x50, 0x09, 0x74, 0xca, 0xaf, 0x87, 0xfc, 0x3e, 0xd9, 0x47, 0xd8, 0x6d, 0x88, 0xde, 0xb3, 0xf8, 0x64, 0x49, 0x08, 0x5d, 0x0d, 0xde, 0xab, 0xee, 0x4b, 0xf4, 0x94, 0xc6, 0xf6, 0x15, 0x70, 0x4f, 0x99, 0xfb, 0x80, 0x53, 0xd1, 0x13, 0xe0, 0x42, 0x4f, 0x0e, 0x4a, 0xc8, 0x4e, 0xac, 0x9f, 0x07, 0xad, 0xfe, 0x0f, 0x00, 0x81, 0xd0, 0x13, 0x74, 0x3b, 0x8e, 0x1d, 0x3f, 0x8b, 0x61, 0xed, 0xc4, 0x8b, 0x74, 0xaf, 0x9d, 0x39, 0xaa, 0x8c, 0x99, 0x0a, 0xd3, 0x1d, 0xdc, 0x32, 0xbc, 0x76, 0x33, 0x36, 0x40, 0xd9, 0x56, 0x17, 0xcd, 0x5d, 0xb5, 0x6e, 0x63, 0x3d, 0x3c, 0xea, 0xf3, 0x0e, 0x2a, 0x99, 0xc9, 0xa3, 0x4f, 0x7d, 0x96, 0x10, 0x85, 0x2a, 0x91, 0x8c, 0xcc, 0x36, 0x38, 0x73, 0x3d, 0xea, 0xb0, 0x24, 0x4d, 0x89, 0x3f, 0x50, 0x92, 0xf1, 0x4c, 0xb9, 0xc0, 0xb2, 0x73, 0x70, 0x62, 0x52, 0x9d, 0x0b, 0xe1, 0x57, 0x31, 0x0b, 0xab, 0x9c, 0xd2, 0x25, 0x0e, 0xf7, 0x38, 0xf4, 0xe9, 0x24, 0xf2, 0x4d, 0x2c, 0x8f, 0x77, 0x23, 0x7a, 0x58, 0x59, 0xa2, 0x2c, 0xaf, 0x52, 0x70, 0x59, 0xbd, 0x41, 0x59, 0x82, 0xee, 0x8d, 0xc9, 0xbd, 0x92, 0xd8, 0x1b, 0xba, 0xf1, 0x45, 0x38, 0x85, 0xb2, 0xb6, 0xe9, 0xb4, 0xc1, 0x84, 0x7d, 0x64, 0xfc, 0xbd, 0x2b, 0xbb, 0x5e, 0x57, 0x5f, 0xc8, 0x66, 0xbf, 0x50, 0xbd, 0xd8, 0xb9, 0x1b, 0x47, 0xda, 0xcc, 0x00, 0x99, 0x3a, 0xac, 0x40, 0x81, 0xb8, 0x01, 0x35, 0x56, 0x0a, 0xe7, 0x32, 0xe5, 0x84, 0x1b, 0xb1, 0xd4, 0x79, 0x8e, 0x00, 0x47, 0x39, 0xcb, 0x1a, 0x46, 0xdf, 0xbd, 0x5b, 0xb3, 0x82, 0x84, 0xcb, 0x50, 0xe2, 0xaf, 0x00, 0x48, 0x1f, 0x5f, 0x72, 0x4c, 0x41, 0xc4, 0x9c, 0xf2, 0xd2, 0x84, 0x79, 0x80, 0x8b, 0xcb, 0xae, 0x5d, 0xf5, 0x92, 0xe9, 0xd7, 0xab, 0xda, 0x53, 0xca, 0x1c, 0xc1, 0xb1, 0xec, 0xa7, 0x29, 0x5d, 0x27, 0xb1, 0x4b, 0x4a, 0x98, 0x1a, 0x0e, 0x9a, 0x2b, 0x87, 0x75, 0x6b, 0xea, 0x7d, 0xfb, 0xc6, 0x80, 0x16, 0x2f, 0x93, 0xca, 0x5e, 0x95, 0x66, 0x30, 0x8f, 0xd2, 0xaa, 0x60, 0xd4, 0x8f, 0xa8, 0x90, 0xfc, 0x70, 0xe6, 0xd4, 0x79, 0xa6, 0xbb, 0x8f, 0xbf, 0xcd, 0xe0, 0x82, 0x60, 0xa1, 0x63, 0xd3, 0x2d, 0x2b, 0x26, 0x67, 0x1a, 0xe6, 0xe1, 0x39, 0x0a, 0x67, 0xc5, 0x27, 0x18, 0x92, 0xdb, 0x4b, 0x50, 0x36, 0x6a, 0x76, 0xe0, 0x40, 0x75, 0xde, 0x35, 0x4f, 0x9e, 0x94, 0x4c, 0x5c, 0x91, 0x9a, 0x82, 0x1e, 0x3d, 0x30, 0x79, 0xca, 0xf4, 0xc6, 0x89, 0x6e, 0x35, 0x2c, 0xe8, 0x21, 0x75, 0x68, 0x71};
227227
HiAE_AEAD_encrypt(key, iv, plain, cipher, plain_len, ad, ad_len, tag);
228228
int AEAD_enc_pass = memcmp(cipher, correct_cipher_text_AEAD, plain_len) | memcmp(tag, correct_tag_AEAD, 16);
@@ -308,7 +308,7 @@ int Verification_API_test_case_1() {
308308

309309
uint8_t tag[16];
310310

311-
uint8_t correct_tag[16] = {0xca, 0x52, 0xef, 0x40, 0x25, 0x5e, 0x37, 0x75, 0xc7, 0x09, 0x28, 0x49, 0x33, 0x77, 0x7d, 0x04};
311+
uint8_t correct_tag[16] = {0x99, 0x76, 0x0f, 0xbd, 0x19, 0x69, 0xbe, 0x56, 0xac, 0x52, 0xe5, 0xeb, 0xb7, 0x3e, 0x50, 0xc7};
312312
HiAE_verification(key, iv, plain, plain_len, tag);
313313
int tag_pass = memcmp(tag, correct_tag, 16);
314314

0 commit comments

Comments
 (0)