Skip to content

Commit

Permalink
Split off .c file from precomputed_ecmult.h
Browse files Browse the repository at this point in the history
  • Loading branch information
@sipa
sipa committed Dec 16, 2021
1 parent 69b4bc9 commit 598a4be
Show file tree
Hide file tree
Showing 5 changed files with 16,520 additions and 16,476 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
src/precomputed_ecmult.h linguist-generated
src/precomputed_ecmult.c linguist-generated
src/precomputed_ecmult_gen.c linguist-generated
src/precomputed_ecmult_gen.h linguist-generated
10 changes: 7 additions & 3 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ noinst_HEADERS += contrib/lax_der_privatekey_parsing.c

PRECOMPUTED_LIB = libsecp256k1_precomputed.la
noinst_LTLIBRARIES = $(PRECOMPUTED_LIB)
libsecp256k1_precomputed_la_SOURCES = src/precomputed_ecmult_gen.c
libsecp256k1_precomputed_la_SOURCES = src/precomputed_ecmult.c src/precomputed_ecmult_gen.c
libsecp256k1_precomputed_la_CPPFLAGS = $(SECP_INCLUDES)

if USE_EXTERNAL_ASM
Expand Down Expand Up @@ -154,7 +154,11 @@ precompute_LDADD = $(SECP_LIBS) $(COMMON_LIB)
# forced by deleting them, e.g., by invoking `make clean-precomp`.
src/precomputed_ecmult.h:
$(MAKE) $(AM_MAKEFLAGS) precompute$(EXEEXT)
./precompute$(EXEEXT) ecmult
./precompute$(EXEEXT) ecmult_h

src/precomputed_ecmult.c:
$(MAKE) $(AM_MAKEFLAGS) precompute$(EXEEXT)
./precompute$(EXEEXT) ecmult_c

src/precomputed_ecmult_gen.h:
$(MAKE) $(AM_MAKEFLAGS) precompute$(EXEEXT)
Expand All @@ -164,7 +168,7 @@ src/precomputed_ecmult_gen.c:
$(MAKE) $(AM_MAKEFLAGS) precompute$(EXEEXT)
./precompute$(EXEEXT) ecmult_gen_c

PRECOMP = src/precomputed_ecmult_gen.h src/precomputed_ecmult_gen.c src/precomputed_ecmult.h
PRECOMP = src/precomputed_ecmult_gen.h src/precomputed_ecmult_gen.c src/precomputed_ecmult.h src/precomputed_ecmult.c
noinst_HEADERS += $(PRECOMP)
precomp: $(PRECOMP)

Expand Down
77 changes: 51 additions & 26 deletions src/precompute.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static void precompute_ecmult_print_table(FILE *fp, const char *name, int window
int j;
int i;

fprintf(fp, "static const secp256k1_ge_storage %s[ECMULT_TABLE_SIZE(WINDOW_G)] = {\n", name);
fprintf(fp, "const secp256k1_ge_storage %s[ECMULT_TABLE_SIZE(WINDOW_G)] = {\n", name);

fprintf(fp, " S(%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32
",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32")\n",
Expand Down Expand Up @@ -61,53 +61,76 @@ static void precompute_ecmult_print_two_tables(FILE *fp, int window_g, const sec
free(table_128);
}

static int precompute_ecmult(void) {
static int precompute_ecmult(int h_file) {
static const char outfile_c[] = "src/precomputed_ecmult.c";
static const char outfile_h[] = "src/precomputed_ecmult.h";
const char* outfile = h_file ? outfile_h : outfile_c;
const secp256k1_ge g = SECP256K1_G;
const int window_g_13 = 4;
const int window_g_199 = 8;
FILE* fp;
FILE *fp;

fp = fopen("src/precomputed_ecmult.h","w");
fp = fopen(outfile, "w");
if (fp == NULL) {
fprintf(stderr, "Could not open src/precomputed_ecmult.h for writing!\n");
fprintf(stderr, "Could not open %s for writing!\n", outfile);
return -1;
}

if (h_file) {
fprintf(fp, "/* This file was automatically generated by precompute. */\n");
fprintf(fp, "#ifndef SECP256K1_PRECOMPUTED_ECMULT_H\n");
fprintf(fp, "#define SECP256K1_PRECOMPUTED_ECMULT_H\n");
fprintf(fp, "#include \"group.h\"\n");
fprintf(fp, "#include \"ecmult.h\"\n");
fprintf(fp, "#if ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE) > %ld\n", ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE));
fprintf(fp, " #error configuration mismatch, invalid ECMULT_WINDOW_SIZE. Try deleting precomputed_ecmult.h before the build.\n");
fprintf(fp, "#endif\n");
fprintf(fp, "#if defined(EXHAUSTIVE_TEST_ORDER)\n");
fprintf(fp, "#if EXHAUSTIVE_TEST_ORDER == 13\n");
fprintf(fp, "#define WINDOW_G %d\n", window_g_13);
fprintf(fp, "#elif EXHAUSTIVE_TEST_ORDER == 199\n");
fprintf(fp, "#define WINDOW_G %d\n", window_g_199);
fprintf(fp, "#else\n");
fprintf(fp, " #error No known generator for the specified exhaustive test group order.\n");
fprintf(fp, "#endif\n");
fprintf(fp, "static secp256k1_ge_storage secp256k1_pre_g[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
fprintf(fp, "static secp256k1_ge_storage secp256k1_pre_g_128[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
fprintf(fp, "#else /* !defined(EXHAUSTIVE_TEST_ORDER) */\n");
fprintf(fp, "#define WINDOW_G ECMULT_WINDOW_SIZE\n");
fprintf(fp, "extern const secp256k1_ge_storage secp256k1_pre_g[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
fprintf(fp, "extern const secp256k1_ge_storage secp256k1_pre_g_128[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
fprintf(fp, "#endif /* EXHAUSTIVE_TEST_ORDER */\n");
fprintf(fp, "#undef S\n");
fprintf(fp, "#endif /* SECP256K1_PRECOMPUTED_ECMULT_H */\n");
fclose(fp);
return 0;
}

fprintf(fp, "/* This file was automatically generated by precompute. */\n");
fprintf(fp, "/* This file contains an array secp256k1_pre_g with odd multiples of the base point G and\n");
fprintf(fp, " * an array secp256k1_pre_g_128 with odd multiples of 2^128*G for accelerating the computation of a*P + b*G.\n");
fprintf(fp, " */\n");
fprintf(fp, "#ifndef SECP256K1_PRECOMPUTED_ECMULT_H\n");
fprintf(fp, "#define SECP256K1_PRECOMPUTED_ECMULT_H\n");
fprintf(fp, "#if defined HAVE_CONFIG_H\n");
fprintf(fp, "#include \"libsecp256k1-config.h\"\n");
fprintf(fp, "#endif\n");
fprintf(fp, "#include \"../include/secp256k1.h\"\n");
fprintf(fp, "#include \"group.h\"\n");
fprintf(fp, "#include \"precomputed_ecmult.h\"\n");
fprintf(fp, "#ifdef S\n");
fprintf(fp, " #error macro identifier S already in use.\n");
fprintf(fp, "#endif\n");
fprintf(fp, "#define S(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) "
"SECP256K1_GE_STORAGE_CONST(0x##a##u,0x##b##u,0x##c##u,0x##d##u,0x##e##u,0x##f##u,0x##g##u,"
"0x##h##u,0x##i##u,0x##j##u,0x##k##u,0x##l##u,0x##m##u,0x##n##u,0x##o##u,0x##p##u)\n");
fprintf(fp, "#if ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE) > %ld\n", ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE));
fprintf(fp, " #error configuration mismatch, invalid ECMULT_WINDOW_SIZE. Try deleting precomputed_ecmult.h before the build.\n");
fprintf(fp, "#endif\n");
fprintf(fp, "#if defined(EXHAUSTIVE_TEST_ORDER)\n");
fprintf(fp, "#if EXHAUSTIVE_TEST_ORDER == 13\n");
fprintf(fp, "#define WINDOW_G %d\n", window_g_13);
fprintf(fp, "#elif EXHAUSTIVE_TEST_ORDER == 199\n");
fprintf(fp, "#define WINDOW_G %d\n", window_g_199);
fprintf(fp, "#else\n");
fprintf(fp, " #error No known generator for the specified exhaustive test group order.\n");
fprintf(fp, "#endif\n");
fprintf(fp, "static secp256k1_ge_storage secp256k1_pre_g[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
fprintf(fp, "static secp256k1_ge_storage secp256k1_pre_g_128[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
fprintf(fp, "#else /* !defined(EXHAUSTIVE_TEST_ORDER) */\n");
fprintf(fp, "#define WINDOW_G ECMULT_WINDOW_SIZE\n");
fprintf(fp, "#error Cannot compile precomputed_ecmult.c in exhaustive test mode\n");
fprintf(fp, "#endif /* EXHAUSTIVE_TEST_ORDER */\n");

precompute_ecmult_print_two_tables(fp, ECMULT_WINDOW_SIZE, &g);

fprintf(fp, "#endif /* EXHAUSTIVE_TEST_ORDER */\n");
fprintf(fp, "#undef S\n");
fprintf(fp, "#endif /* SECP256K1_PRECOMPUTED_ECMULT_H */\n");
fclose(fp);

return 0;
}

Expand Down Expand Up @@ -202,14 +225,16 @@ static int precompute_ecmult_gen(int h_file) {
}

int main(int argc, char** argv) {
if (argc == 2 && !strcmp(argv[1], "ecmult")) {
return precompute_ecmult();
if (argc == 2 && !strcmp(argv[1], "ecmult_c")) {
return precompute_ecmult(0);
} else if (argc == 2 && !strcmp(argv[1], "ecmult_h")) {
return precompute_ecmult(1);
} else if (argc == 2 && !strcmp(argv[1], "ecmult_gen_c")) {
return precompute_ecmult_gen(0);
} else if (argc == 2 && !strcmp(argv[1], "ecmult_gen_h")) {
return precompute_ecmult_gen(1);
} else {
fprintf(stderr, "Usage: ./precompute [ecmult|ecmult_gen_c|ecmult_gen_h]\n");
fprintf(stderr, "Usage: ./precompute [ecmult_c|ecmult_h|ecmult_gen_c|ecmult_gen_h]\n");
return 1;
}
}
Loading

0 comments on commit 598a4be

Please sign in to comment.