aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/build-data/makefile/gmake.in20
-rw-r--r--src/build-data/makefile/header.in8
-rw-r--r--src/build-data/makefile/nmake.in22
-rw-r--r--src/cli/apps.h (renamed from src/cmd/apps.h)0
-rw-r--r--src/cli/asn1.cpp (renamed from src/cmd/asn1.cpp)0
-rw-r--r--src/cli/base64.cpp (renamed from src/cmd/base64.cpp)0
-rw-r--r--src/cli/bcrypt.cpp (renamed from src/cmd/bcrypt.cpp)0
-rw-r--r--src/cli/ca.cpp (renamed from src/cmd/ca.cpp)0
-rw-r--r--src/cli/cert_verify.cpp (renamed from src/cmd/cert_verify.cpp)0
-rw-r--r--src/cli/compress.cpp (renamed from src/cmd/compress.cpp)0
-rw-r--r--src/cli/credentials.h (renamed from src/cmd/credentials.h)0
-rw-r--r--src/cli/dl_group.cpp (renamed from src/cmd/dl_group.cpp)0
-rw-r--r--src/cli/dsa_sign.cpp (renamed from src/cmd/dsa_sign.cpp)0
-rw-r--r--src/cli/dsa_ver.cpp (renamed from src/cmd/dsa_ver.cpp)0
-rw-r--r--src/cli/factor.cpp (renamed from src/cmd/factor.cpp)0
-rw-r--r--src/cli/fpe.cpp (renamed from src/cmd/fpe.cpp)0
-rw-r--r--src/cli/fuzzer.cpp (renamed from src/cmd/fuzzer.cpp)0
-rw-r--r--src/cli/getopt.cpp (renamed from src/cmd/getopt.cpp)0
-rw-r--r--src/cli/getopt.h (renamed from src/cmd/getopt.h)0
-rw-r--r--src/cli/hash.cpp (renamed from src/cmd/hash.cpp)0
-rw-r--r--src/cli/implementation/speed.h (renamed from src/cmd/implementation/speed.h)0
-rw-r--r--src/cli/implementation/speed_prime.cpp (renamed from src/cmd/implementation/speed_prime.cpp)0
-rw-r--r--src/cli/implementation/speed_public_key.cpp (renamed from src/cmd/implementation/speed_public_key.cpp)0
-rw-r--r--src/cli/implementation/speed_transform.cpp (renamed from src/cmd/implementation/speed_transform.cpp)0
-rw-r--r--src/cli/implementation/timer.cpp (renamed from src/cmd/implementation/timer.cpp)0
-rw-r--r--src/cli/implementation/timer.h (renamed from src/cmd/implementation/timer.h)0
-rw-r--r--src/cli/is_prime.cpp (renamed from src/cmd/is_prime.cpp)0
-rw-r--r--src/cli/keygen.cpp (renamed from src/cmd/keygen.cpp)0
-rw-r--r--src/cli/main.cpp (renamed from src/cmd/main.cpp)0
-rw-r--r--src/cli/mce.cpp (renamed from src/cmd/mce.cpp)0
-rw-r--r--src/cli/ocsp.cpp (renamed from src/cmd/ocsp.cpp)0
-rw-r--r--src/cli/pkcs10.cpp (renamed from src/cmd/pkcs10.cpp)0
-rw-r--r--src/cli/pkcs8.cpp (renamed from src/cmd/pkcs8.cpp)0
-rw-r--r--src/cli/prime.cpp (renamed from src/cmd/prime.cpp)0
-rw-r--r--src/cli/rng.cpp (renamed from src/cmd/rng.cpp)0
-rw-r--r--src/cli/self_sig.cpp (renamed from src/cmd/self_sig.cpp)0
-rw-r--r--src/cli/speed.cpp (renamed from src/cmd/speed.cpp)0
-rw-r--r--src/cli/tls_client.cpp (renamed from src/cmd/tls_client.cpp)0
-rw-r--r--src/cli/tls_proxy.cpp (renamed from src/cmd/tls_proxy.cpp)0
-rw-r--r--src/cli/tls_server.cpp (renamed from src/cmd/tls_server.cpp)0
-rw-r--r--src/cli/x509print.cpp (renamed from src/cmd/x509print.cpp)0
41 files changed, 25 insertions, 25 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 4eb4b0fe6..d68db271c 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -3,7 +3,7 @@
%{gmake_commands_in}
# Executable targets
-APP = %{out_dir}/botan%{program_suffix}
+CLI = %{out_dir}/botan%{program_suffix}
TEST = %{out_dir}/botan-test%{program_suffix}
# Library targets
@@ -16,26 +16,26 @@ INCLUDE_DIR = %{botan_include_dir}
LIBOBJS = %{lib_objs}
-APPOBJS = %{app_objs}
+CLIOBJS = %{cli_objs}
TESTOBJS = %{test_objs}
# First make target. Will be used by default
-all: $(APP) $(TEST)
+all: $(CLI) $(TEST)
# Build Commands
%{lib_build_cmds}
-%{app_build_cmds}
+%{cli_build_cmds}
%{test_build_cmds}
# Link Commands
%{gmake_dso_in}
-$(APP): $(LIBRARIES) $(APPOBJS)
- $(APP_LINK_CMD) $(LDFLAGS) $(APPOBJS) -L%{out_dir} -l%{libname} $(APP_LINKS_TO) -o $(APP)
- $(APP_POST_LINK_CMD)
+$(CLI): $(LIBRARIES) $(CLIOBJS)
+ $(CLI_LINK_CMD) $(LDFLAGS) $(CLIOBJS) -L%{out_dir} -l%{libname} $(CLI_LINKS_TO) -o $(CLI)
+ $(CLI_POST_LINK_CMD)
$(TEST): $(LIBRARIES) $(TESTOBJS)
$(TEST_LINK_CMD) $(LDFLAGS) $(TESTOBJS) -L%{out_dir} -l%{libname} $(TEST_LINKS_TO) -o $(TEST)
@@ -57,9 +57,9 @@ SPHINX_OPTS = -b html
clean:
-$(RM) %{libobj_dir}/*
-$(RM) %{testobj_dir}/*
- -$(RM) %{appobj_dir}/*
+ -$(RM) %{cliobj_dir}/*
-$(RM) $(SONAME) $(SYMLINK)
- -$(RM) $(LIBRARIES) $(APP) $(TEST)
+ -$(RM) $(LIBRARIES) $(CLI) $(TEST)
distclean: clean
$(RM) Makefile
@@ -72,5 +72,5 @@ valgrind:
docs:
%{build_doc_commands}
-install: $(APP) docs
+install: $(CLI) docs
$(SCRIPTS_DIR)/install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir}
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index eaf4b511d..6e432440c 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -7,18 +7,18 @@ WARN_FLAGS = %{cc_warning_flags}
SO_OBJ_FLAGS = %{shared_flags}
LIB_LINK_CMD = %{lib_link_cmd}
-APP_LINK_CMD = %{app_link_cmd}
+CLI_LINK_CMD = %{cli_link_cmd}
TEST_LINK_CMD = %{test_link_cmd}
LIB_LINKS_TO = %{link_to}
-APP_LINKS_TO = $(LIB_LINKS_TO)
+CLI_LINKS_TO = $(LIB_LINKS_TO)
TEST_LINKS_TO = $(LIB_LINKS_TO)
LIB_FLAGS = $(SO_OBJ_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
-APP_FLAGS = $(CXXFLAGS) $(WARN_FLAGS)
+CLI_FLAGS = $(CXXFLAGS) $(WARN_FLAGS)
TEST_FLAGS = $(CXXFLAGS) $(WARN_FLAGS)
SCRIPTS_DIR = %{scripts_dir}
-APP_POST_LINK_CMD = %{app_post_link_cmd}
+CLI_POST_LINK_CMD = %{cli_post_link_cmd}
TEST_POST_LINK_CMD = %{test_post_link_cmd}
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 88188071b..119e91849 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -14,7 +14,7 @@ RM_R = $(RM) /S
RMDIR = @rmdir
# Executable targets
-APP = %{out_dir}\botan%{program_suffix}
+CLI = %{out_dir}\botan%{program_suffix}
TEST = %{out_dir}\botan-test%{program_suffix}
# Library targets
@@ -37,24 +37,24 @@ LIBRARIES = $(SO_FILENAME)
# File Lists
LIBOBJS = %{lib_objs}
-APPOBJS = %{app_objs}
+CLIOBJS = %{cli_objs}
TESTOBJS = %{test_objs}
# First make target. Will be used by default
-all: $(APP) $(TEST)
+all: $(CLI) $(TEST)
# Build Commands
%{lib_build_cmds}
-%{app_build_cmds}
+%{cli_build_cmds}
%{test_build_cmds}
# Link Commands
-$(APP): $(LIBRARIES) $(APPOBJS)
- $(APP_LINK_CMD) /OUT:$@ $(APPOBJS) $(LIB_FILENAME) $(APP_LINKS_TO)
- $(APP_POST_LINK_CMD)
+$(CLI): $(LIBRARIES) $(CLIOBJS)
+ $(CLI_LINK_CMD) /OUT:$@ $(CLIOBJS) $(LIB_FILENAME) $(CLI_LINKS_TO)
+ $(CLI_POST_LINK_CMD)
$(TEST): $(LIBRARIES) $(TESTOBJS)
$(TEST_LINK_CMD) /OUT:$@ $(TESTOBJS) $(LIB_FILENAME) $(TEST_LINKS_TO)
@@ -81,12 +81,12 @@ docs:
clean:
-$(RM) %{libobj_dir}\*
+ -$(RM) %{cliobj_dir}\*
-$(RM) %{testobj_dir}\*
- -$(RM) %{appobj_dir}\*
-$(RM) %{out_dir}\*.manifest
-$(RM) %{out_dir}\*.exp
-$(RM) %{out_dir}\*.dll
- -$(RM) $(LIBRARIES) $(APP) $(TEST)
+ -$(RM) $(LIBRARIES) $(CLI) $(TEST)
distclean: clean
$(RM_R) %{build_dir}
@@ -95,7 +95,7 @@ distclean: clean
$(RMDIR) %{build_dir}\include
$(RMDIR) %{build_dir}\lib %{build_dir}\tests
$(RMDIR) %{build_dir}
- $(RM) Makefile $(LIB_BASENAME).* $(APP).*
+ $(RM) Makefile $(LIB_BASENAME).* $(CLI).*
-install: $(APP) docs
+install: $(CLI) docs
$(SCRIPTS_DIR)\install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir}
diff --git a/src/cmd/apps.h b/src/cli/apps.h
index 9f1f00ba2..9f1f00ba2 100644
--- a/src/cmd/apps.h
+++ b/src/cli/apps.h
diff --git a/src/cmd/asn1.cpp b/src/cli/asn1.cpp
index 2aa94cc39..2aa94cc39 100644
--- a/src/cmd/asn1.cpp
+++ b/src/cli/asn1.cpp
diff --git a/src/cmd/base64.cpp b/src/cli/base64.cpp
index d2a9a1853..d2a9a1853 100644
--- a/src/cmd/base64.cpp
+++ b/src/cli/base64.cpp
diff --git a/src/cmd/bcrypt.cpp b/src/cli/bcrypt.cpp
index 81f7c536e..81f7c536e 100644
--- a/src/cmd/bcrypt.cpp
+++ b/src/cli/bcrypt.cpp
diff --git a/src/cmd/ca.cpp b/src/cli/ca.cpp
index fb6d9582a..fb6d9582a 100644
--- a/src/cmd/ca.cpp
+++ b/src/cli/ca.cpp
diff --git a/src/cmd/cert_verify.cpp b/src/cli/cert_verify.cpp
index 7a1bec983..7a1bec983 100644
--- a/src/cmd/cert_verify.cpp
+++ b/src/cli/cert_verify.cpp
diff --git a/src/cmd/compress.cpp b/src/cli/compress.cpp
index 93bc76eb4..93bc76eb4 100644
--- a/src/cmd/compress.cpp
+++ b/src/cli/compress.cpp
diff --git a/src/cmd/credentials.h b/src/cli/credentials.h
index 06349657d..06349657d 100644
--- a/src/cmd/credentials.h
+++ b/src/cli/credentials.h
diff --git a/src/cmd/dl_group.cpp b/src/cli/dl_group.cpp
index e9a4f3fd4..e9a4f3fd4 100644
--- a/src/cmd/dl_group.cpp
+++ b/src/cli/dl_group.cpp
diff --git a/src/cmd/dsa_sign.cpp b/src/cli/dsa_sign.cpp
index 03aede585..03aede585 100644
--- a/src/cmd/dsa_sign.cpp
+++ b/src/cli/dsa_sign.cpp
diff --git a/src/cmd/dsa_ver.cpp b/src/cli/dsa_ver.cpp
index 64d60a5cf..64d60a5cf 100644
--- a/src/cmd/dsa_ver.cpp
+++ b/src/cli/dsa_ver.cpp
diff --git a/src/cmd/factor.cpp b/src/cli/factor.cpp
index d2c0a2df5..d2c0a2df5 100644
--- a/src/cmd/factor.cpp
+++ b/src/cli/factor.cpp
diff --git a/src/cmd/fpe.cpp b/src/cli/fpe.cpp
index 97ca34b24..97ca34b24 100644
--- a/src/cmd/fpe.cpp
+++ b/src/cli/fpe.cpp
diff --git a/src/cmd/fuzzer.cpp b/src/cli/fuzzer.cpp
index 35adb9711..35adb9711 100644
--- a/src/cmd/fuzzer.cpp
+++ b/src/cli/fuzzer.cpp
diff --git a/src/cmd/getopt.cpp b/src/cli/getopt.cpp
index 7b7e14932..7b7e14932 100644
--- a/src/cmd/getopt.cpp
+++ b/src/cli/getopt.cpp
diff --git a/src/cmd/getopt.h b/src/cli/getopt.h
index f683159d0..f683159d0 100644
--- a/src/cmd/getopt.h
+++ b/src/cli/getopt.h
diff --git a/src/cmd/hash.cpp b/src/cli/hash.cpp
index 81a72ca17..81a72ca17 100644
--- a/src/cmd/hash.cpp
+++ b/src/cli/hash.cpp
diff --git a/src/cmd/implementation/speed.h b/src/cli/implementation/speed.h
index 3cfd0ef61..3cfd0ef61 100644
--- a/src/cmd/implementation/speed.h
+++ b/src/cli/implementation/speed.h
diff --git a/src/cmd/implementation/speed_prime.cpp b/src/cli/implementation/speed_prime.cpp
index a7a344bef..a7a344bef 100644
--- a/src/cmd/implementation/speed_prime.cpp
+++ b/src/cli/implementation/speed_prime.cpp
diff --git a/src/cmd/implementation/speed_public_key.cpp b/src/cli/implementation/speed_public_key.cpp
index 2ff49bd15..2ff49bd15 100644
--- a/src/cmd/implementation/speed_public_key.cpp
+++ b/src/cli/implementation/speed_public_key.cpp
diff --git a/src/cmd/implementation/speed_transform.cpp b/src/cli/implementation/speed_transform.cpp
index 2db5cdd70..2db5cdd70 100644
--- a/src/cmd/implementation/speed_transform.cpp
+++ b/src/cli/implementation/speed_transform.cpp
diff --git a/src/cmd/implementation/timer.cpp b/src/cli/implementation/timer.cpp
index 14e55316b..14e55316b 100644
--- a/src/cmd/implementation/timer.cpp
+++ b/src/cli/implementation/timer.cpp
diff --git a/src/cmd/implementation/timer.h b/src/cli/implementation/timer.h
index ac5bd5cef..ac5bd5cef 100644
--- a/src/cmd/implementation/timer.h
+++ b/src/cli/implementation/timer.h
diff --git a/src/cmd/is_prime.cpp b/src/cli/is_prime.cpp
index 71fec730b..71fec730b 100644
--- a/src/cmd/is_prime.cpp
+++ b/src/cli/is_prime.cpp
diff --git a/src/cmd/keygen.cpp b/src/cli/keygen.cpp
index 168b27a4a..168b27a4a 100644
--- a/src/cmd/keygen.cpp
+++ b/src/cli/keygen.cpp
diff --git a/src/cmd/main.cpp b/src/cli/main.cpp
index 8d229ce0e..8d229ce0e 100644
--- a/src/cmd/main.cpp
+++ b/src/cli/main.cpp
diff --git a/src/cmd/mce.cpp b/src/cli/mce.cpp
index 226f21e9c..226f21e9c 100644
--- a/src/cmd/mce.cpp
+++ b/src/cli/mce.cpp
diff --git a/src/cmd/ocsp.cpp b/src/cli/ocsp.cpp
index e5b42b076..e5b42b076 100644
--- a/src/cmd/ocsp.cpp
+++ b/src/cli/ocsp.cpp
diff --git a/src/cmd/pkcs10.cpp b/src/cli/pkcs10.cpp
index 106fe2c24..106fe2c24 100644
--- a/src/cmd/pkcs10.cpp
+++ b/src/cli/pkcs10.cpp
diff --git a/src/cmd/pkcs8.cpp b/src/cli/pkcs8.cpp
index 7bc1c2561..7bc1c2561 100644
--- a/src/cmd/pkcs8.cpp
+++ b/src/cli/pkcs8.cpp
diff --git a/src/cmd/prime.cpp b/src/cli/prime.cpp
index 82efa75d2..82efa75d2 100644
--- a/src/cmd/prime.cpp
+++ b/src/cli/prime.cpp
diff --git a/src/cmd/rng.cpp b/src/cli/rng.cpp
index 3fe8719ce..3fe8719ce 100644
--- a/src/cmd/rng.cpp
+++ b/src/cli/rng.cpp
diff --git a/src/cmd/self_sig.cpp b/src/cli/self_sig.cpp
index 2c43f7acc..2c43f7acc 100644
--- a/src/cmd/self_sig.cpp
+++ b/src/cli/self_sig.cpp
diff --git a/src/cmd/speed.cpp b/src/cli/speed.cpp
index e8d30c6f1..e8d30c6f1 100644
--- a/src/cmd/speed.cpp
+++ b/src/cli/speed.cpp
diff --git a/src/cmd/tls_client.cpp b/src/cli/tls_client.cpp
index 7f74e1a37..7f74e1a37 100644
--- a/src/cmd/tls_client.cpp
+++ b/src/cli/tls_client.cpp
diff --git a/src/cmd/tls_proxy.cpp b/src/cli/tls_proxy.cpp
index 5071cb8bb..5071cb8bb 100644
--- a/src/cmd/tls_proxy.cpp
+++ b/src/cli/tls_proxy.cpp
diff --git a/src/cmd/tls_server.cpp b/src/cli/tls_server.cpp
index ea68208b6..ea68208b6 100644
--- a/src/cmd/tls_server.cpp
+++ b/src/cli/tls_server.cpp
diff --git a/src/cmd/x509print.cpp b/src/cli/x509print.cpp
index e583c91c2..e583c91c2 100644
--- a/src/cmd/x509print.cpp
+++ b/src/cli/x509print.cpp
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 17:35:09 +0000