mirrors
/
kore
mirror of https://git.kore.io/kore.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Remove leftover feature defines from kodev.

This commit is contained in:
Joris Vink 2017-02-22 20:13:59 +01:00
parent ead0a4199c
commit 6e6d2f005d
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cli.c
View File

@ -220,9 +220,7 @@ static struct filegen gen_files[] = {
static const char *gen_dirs[] = { static const char *gen_dirs[] = {
"src", "src",
#if !defined(KORE_NO_TLS)
"cert", "cert",
#endif
"conf", "conf",
"assets", "assets",
NULL NULL
@ -267,7 +265,7 @@ static const char *config_data =
static const char *build_data = static const char *build_data =
"# %s build config\n" "# %s build config\n"
"# You can switch flavors using: kore flavor [newflavor]\n" "# You can switch flavors using: kodev flavor [newflavor]\n"
"\n" "\n"
"# Set to yes if you wish to produce a single binary instead\n" "# Set to yes if you wish to produce a single binary instead\n"
"# of a dynamic library. If you set this to yes you must also\n" "# of a dynamic library. If you set this to yes you must also\n"
@ -301,7 +299,6 @@ static const char *build_data =
"# included if you build with the \"prod\" flavor.\n" "# included if you build with the \"prod\" flavor.\n"
"#}\n"; "#}\n";
#if !defined(KORE_NO_TLS)
static const char *dh2048_data = static const char *dh2048_data =
"-----BEGIN DH PARAMETERS-----\n" "-----BEGIN DH PARAMETERS-----\n"
"MIIBCAKCAQEAn4f4Qn5SudFjEYPWTbUaOTLUH85YWmmPFW1+b5bRa9ygr+1wfamv\n" "MIIBCAKCAQEAn4f4Qn5SudFjEYPWTbUaOTLUH85YWmmPFW1+b5bRa9ygr+1wfamv\n"
@ -311,7 +308,6 @@ static const char *dh2048_data =
"Bzy9fYgnUlJ82g/bziCI83R2xAdtH014fR63MpElkqdNeChb94pPbEdFlNUvYIBN\n" "Bzy9fYgnUlJ82g/bziCI83R2xAdtH014fR63MpElkqdNeChb94pPbEdFlNUvYIBN\n"
"xx2vTUQMqRbB4UdG2zuzzr5j98HDdblQ+wIBAg==\n" "xx2vTUQMqRbB4UdG2zuzzr5j98HDdblQ+wIBAg==\n"
"-----END DH PARAMETERS-----"; "-----END DH PARAMETERS-----";
#endif
static const char *gitignore = "*.o\n.flavor\n.objs\n%s.so\nassets.h\ncert\n"; static const char *gitignore = "*.o\n.flavor\n.objs\n%s.so\nassets.h\ncert\n";
@ -414,10 +410,8 @@ cli_create(int argc, char **argv)
cli_generate_certs(); cli_generate_certs();
printf("%s created successfully!\n", appl); printf("%s created successfully!\n", appl);
printf("WARNING: DO NOT USE THE GENERATED DH PARAMETERS "
#if !defined(KORE_NO_TLS) "AND CERTIFICATES IN PRODUCTION\n");
printf("note: do NOT use the created DH parameters/certificates in production\n");
#endif
} }
static void static void
@ -1148,7 +1142,6 @@ cli_find_files(const char *path, void (*cb)(char *, struct dirent *))
static void static void
cli_generate_certs(void) cli_generate_certs(void)
{ {
#if !defined(KORE_NO_TLS)
BIGNUM *e; BIGNUM *e;
FILE *fp; FILE *fp;
time_t now; time_t now;
@ -1238,7 +1231,6 @@ cli_generate_certs(void)
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
X509_free(x509); X509_free(x509);
#endif
} }
static void static void